Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/external/bullet/changes_orxonox.diff @ 5756

Last change on this file since 5756 was 5738, checked in by landauf, 15 years ago

merged libraries2 back to trunk

  • Property svn:eol-style set to native
File size: 684 bytes
RevLine 
[2883]1Index: btScalar.h
2===================================================================
3--- btScalar.h  (revision 2882)
4+++ btScalar.h  (working copy)
5@@ -236,7 +236,11 @@
[2705]6 SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
7 SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
8 SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
9-SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
10+  #if defined( __MINGW32__ )
11+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
12+  #else
13+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
14+  #endif
[2883]15
[2705]16 #endif
[2883]17
Note: See TracBrowser for help on using the repository browser.