Changeset 2883 for code/trunk/src

Timestamp:

Mar 31, 2009, 10:28:36 PM (16 years ago)

Author:

landauf

Message:

reapplied mingw-patch

Location:

code/trunk/src/bullet

Files:

• LinearMath/btScalar.h (modified) (1 diff)
• changes_orxonox.diff (modified) (2 diffs)

code/trunk/src/bullet/LinearMath/btScalar.h

@@ -237 +237 @@
 SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
 SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
-SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
+  #if defined( __MINGW32__ )
+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
+  #else
+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
+  #endif
         
 #endif

code/trunk/src/bullet/changes_orxonox.diff

@@ -1 @@
---- LinearMath\btScalar.h       So Feb 15 18:28:13 2009
-+++ LinearMath\btScalar.h       Sa Feb 14 23:04:53 2009
-@@ -227,7 +227,11 @@
+Index: btScalar.h
+===================================================================
+--- btScalar.h  (revision 2882)
++++ btScalar.h  (working copy)
+@@ -236,7 +236,11 @@
  SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
  SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
@@ -11 +13 @@
 +  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
 +  #endif
- 
+
  #endif
- 
+