Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/bullet/changes_orxonox.diff @ 2743

Last change on this file since 2743 was 2710, checked in by rgrieder, 16 years ago

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

  • Property svn:eol-style set to native
File size: 639 bytes
RevLine 
[2705]1--- LinearMath\btScalar.h       So Feb 15 18:28:13 2009
2+++ LinearMath\btScalar.h       Sa Feb 14 23:04:53 2009
3@@ -227,7 +227,11 @@
4 SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
5 SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
6 SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
7-SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
8+  #if defined( __MINGW32__ )
9+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
10+  #else
11+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
12+  #endif
13 
14 #endif
15 
Note: See TracBrowser for help on using the repository browser.