updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.

So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.

sorry if this breaks your builds!

5 files changed, 13 insertions, 19 deletions

diff --git a/source/Makefile b/source/Makefile
index 67ec1c82961..078eb867abe 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -125,9 +125,7 @@ ifneq ($(NAN_NO_KETSJI),true)
 #    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
 #    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
-    ifeq ($(NAN_USE_BULLET), true)
-       COMLIB += $(OCGDIR)/gameengine/blphys/blbullet/$(DEBUG_DIR)libblbullet.a
-    endif
+    COMLIB += $(OCGDIR)/gameengine/blphys/blbullet/$(DEBUG_DIR)libblbullet.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
 #    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
@@ -147,10 +145,8 @@ ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/ketsji/KXNetwork/$(DEBUG_DIR)libKXNetwork.a
     COMLIB += $(OCGDIR)/gameengine/Network/$(DEBUG_DIR)libNetwork.a
     COMLIB += $(OCGDIR)/gameengine/Network/LoopBackNetwork/$(DEBUG_DIR)libLoopBackNetwork.a
-    ifeq ($(NAN_USE_BULLET), true)
-       COMLIB += $(NAN_BULLET)/lib/libbulletdyn.a
-       COMLIB += $(NAN_BULLET)/lib/libbullet.a
-    endif
+    COMLIB += $(NAN_BULLET)/lib/libbulletdyn.a
+    COMLIB += $(NAN_BULLET)/lib/libbullet.a
 endif
     COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
     COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index e38ff77f76e..b1922e247d1 100644
--- 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... */
+//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_BULLET
+
 //#define USE_ODE
 
 //on visual studio 7/8, always enable BULLET for now 
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index aa74e4e29c7..7051f7e5541 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -57,7 +57,8 @@ source_files = ['KX_WorldIpoController.cpp',
                 'KX_CDActuator.cpp',
                 'KX_CameraIpoSGController.cpp',
                 'KX_CameraActuator.cpp',
-                'KX_Camera.cpp'
+                'KX_Camera.cpp',
+                'KX_BulletPhysicsController.cpp'
                 ]
 
 if user_options_dict['USE_PHYSICS'] == 'solid':
@@ -68,10 +69,6 @@ if user_options_dict['USE_PHYSICS'] == 'ode':
     source_files += ['KX_OdePhysicsController.cpp']
     ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
 
-if user_options_dict['USE_PHYSICS'] == 'bullet':
-    source_files += ['KX_BulletPhysicsController.cpp']
-    ketsji_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE'])
-    ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
 
 ketsji_env.Append (CPPPATH = ['.',
                               '#source/kernel/gen_system',
@@ -118,5 +115,6 @@ if sys.platform == 'win32':
 	ketsji_env.Append ( CCFLAGS =['/Ox'])
 ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
 ketsji_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
+ketsji_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE'])
 
 ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files)
diff --git a/source/gameengine/Physics/Makefile b/source/gameengine/Physics/Makefile
index b88cedee8f2..62e433cb72c 100644
--- a/source/gameengine/Physics/Makefile
+++ b/source/gameengine/Physics/Makefile
@@ -35,10 +35,7 @@ include nan_definitions.mk
 
 SOURCEDIR = source/gameengine/Physics
 DIR = $(OCGDIR)/gameengine/blphys
-DIRS = common Sumo Dummy
+DIRS = common Sumo Dummy Bullet
 #DIRS += BlOde
-ifeq ($(NAN_USE_BULLET), true)
- DIRS += Bullet
-endif
 
 include nan_subdirs.mk
diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript
index 496d9dc8f3c..ca4283944b5 100644
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -13,7 +13,8 @@ SConscript(['BlenderRoutines/SConscript',
             'Physics/Dummy/SConscript',
             'Rasterizer/SConscript',
             'Rasterizer/RAS_OpenGLRasterizer/SConscript',
-            'SceneGraph/SConscript'])
+            'SceneGraph/SConscript',
+            'Physics/Bullet/SConscript'])
 
 if user_options_dict['BUILD_BLENDER_PLAYER']:
 	SConscript(['GamePlayer/SConscript'])
@@ -22,5 +23,3 @@ if user_options_dict['USE_PHYSICS'] == 'solid':
     SConscript(['Physics/Sumo/SConscript'])
 elif user_options_dict['USE_PHYSICS'] == 'ode':
     SConscript(['Physics/BlOde/SConscript'])
-elif user_options_dict['USE_PHYSICS'] == 'bullet':
-    SConscript(['Physics/Bullet/SConscript'])