updated SConstruct and Makefile so that if you compile the gameengine, is always...

[blender.git] / source / gameengine / Ketsji / KX_ConvertPhysicsObject.h

diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index e38ff77f76e88ac8e66634ced82d96bc357a662a..b1922e247d149d6c19443e7c76c37559ee2c8348 100644 (file)
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -33,7 +33,11 @@
 #define KX_CONVERTPHYSICSOBJECTS
 
 /* These are defined by the build system... */
 #define KX_CONVERTPHYSICSOBJECTS
 
 /* These are defined by the build system... */

+//but the build system is broken, because it doesn't allow for 2 or more defines at once.
+//Please leave Sumo _AND_ Bullet enabled

 #define USE_SUMO_SOLID
 #define USE_SUMO_SOLID

+#define USE_BULLET
+

 //#define USE_ODE
 
 //on visual studio 7/8, always enable BULLET for now 
 //#define USE_ODE
 
 //on visual studio 7/8, always enable BULLET for now