Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/kicklib2/src/external/bullet/changes_orxonox.diff @ 8501

Last change on this file since 8501 was 8284, checked in by rgrieder, 14 years ago

Merged revisions 7978 - 8096 from kicklib to kicklib2.
  • Property svn:eol-style set to native
File size: 721 bytes

  • LinearMath/btScalar.h

     
    286286SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
    287287SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
    288288SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
    289 SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
     289  #if defined( __MINGW32__ )
     290  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
     291  #else
     292  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
     293  #endif
    290294SIMD_FORCE_INLINE btScalar btFmod(btScalar x,btScalar y) { return fmodf(x,y); }
    291295       
    292296#endif
Note: See TracBrowser for help on using the repository browser.