Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/pickups/src/bullet/changes_orxonox.diff @ 3021

Last change on this file since 3021 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

  • LinearMath\btScalar.h

     
    227227SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
    228228SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
    229229SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
    230 SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
     230  #if defined( __MINGW32__ )
     231  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
     232  #else
     233  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
     234  #endif
    231235
    232236#endif
    233237
Note: See TracBrowser for help on using the repository browser.