source:
code/branches/questsystem5/src/bullet/changes_orxonox.diff
@
2948
| Last change on this file since 2948 was 2908, checked in by dafrick, 16 years ago | |
|---|---|
|
Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. |
|
|
|
| File size: 639 bytes | |
)| Rev | Line | |
|---|---|---|
| [2908] | 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 @@ | |
| [2705] | 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 | |
| [2908] | 13 | |
| [2705] | 14 | #endif |
| [2908] | 15 |
Note: See TracBrowser
for help on using the repository browser.
