Building the game engine with Solid/Sumo is now optional for scons using WITH_BF_SOLID.

[blender-staging.git] / source / gameengine / SConscript

diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript
index 9ae0df1a8aa04ed3b26ab4fc7f30b3b46af20372..51a05e70a07dc0aa60c4d9f5c8f301a8e420e2d2 100644 (file)
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -1,22 +1,30 @@
-Import ('use_ode')
-Import ('use_sumo')
+#!/usr/bin/python
+Import ('env')
 
-SConscript(['Ketsji/SConscript',
-            'Ketsji/KXNetwork/SConscript',
-            'Expressions/SConscript',
-            'BlenderRoutines/SConscript',
+SConscript(['BlenderRoutines/SConscript',
             'Converter/SConscript',
+            'Expressions/SConscript',
+            'GameLogic/SConscript',
+            'Ketsji/SConscript',
+            'Ketsji/KXNetwork/SConscript',
             'Network/SConscript',
             'Network/LoopBackNetwork/SConscript',
-            'GameLogic/SConscript',
             'Physics/common/SConscript',
             'Physics/Dummy/SConscript',
             'Rasterizer/SConscript',
             'Rasterizer/RAS_OpenGLRasterizer/SConscript',
-            'SceneGraph/SConscript'])
+            'SceneGraph/SConscript',
+            'Physics/Bullet/SConscript',
+            'VideoTexture/SConscript'
+            ])
+
+if env['WITH_BF_SOLID']:
+       SConscript(['Physics/Sumo/SConscript'])
 
-if use_sumo == 'true':
-    SConscript(['Physics/Sumo/SConscript'])
+if env['WITH_BF_PLAYER']:
+    SConscript(['GamePlayer/SConscript'])
 
-if use_ode == 'true':
-    SConscript(['Physics/BlOde/SConscript'])
+#if user_options_dict['USE_PHYSICS'] == 'solid':
+#    SConscript(['Physics/Sumo/SConscript'])
+#elif user_options_dict['USE_PHYSICS'] == 'ode':
+#    SConscript(['Physics/BlOde/SConscript'])