Browse Source

Merge pull request #1198 from BeamNG/fix_bullet

Fix Bullet compilation.
Luis Anton Rebollo 10 years ago
parent
commit
1d501ea95e
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Engine/source/T3D/physics/bullet/bt.h

+ 5 - 1
Engine/source/T3D/physics/bullet/bt.h

@@ -24,10 +24,14 @@
 #define _BULLET_H_
 
 // NOTE: We set these defines which bullet needs here.
-#ifdef TORQUE_OS_WIN
+#if defined TORQUE_OS_WIN && !defined(WIN32)
 #define WIN32
 #endif
 
+#ifdef TORQUE_CPU_X86
+#define __BT_SKIP_UINT64_H
+#endif
+
 // NOTE: All the Bullet includes we use should be here and
 // nowhere else.... beware!