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 1b2c6316c6177e2649797209aeae1ec8ffa2b50d..51a05e70a07dc0aa60c4d9f5c8f301a8e420e2d2 100644 (file)
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-Import ('user_options_dict')
+Import ('env')
 
 SConscript(['BlenderRoutines/SConscript',
             'Converter/SConscript',
@@ -13,12 +13,18 @@ SConscript(['BlenderRoutines/SConscript',
             'Physics/Dummy/SConscript',
             'Rasterizer/SConscript',
             'Rasterizer/RAS_OpenGLRasterizer/SConscript',
-            'SceneGraph/SConscript'])
+            'SceneGraph/SConscript',
+            'Physics/Bullet/SConscript',
+            'VideoTexture/SConscript'
+            ])
 
-if user_options_dict['BUILD_BLENDER_PLAYER']:
-       SConscript(['GamePlayer/SConscript'])
+if env['WITH_BF_SOLID']:
+       SConscript(['Physics/Sumo/SConscript'])
 
-if user_options_dict['USE_PHYSICS'] == 'solid':
-    SConscript(['Physics/Sumo/SConscript'])
-elif user_options_dict['USE_PHYSICS'] == 'ode':
-    SConscript(['Physics/BlOde/SConscript'])
+if env['WITH_BF_PLAYER']:
+    SConscript(['GamePlayer/SConscript'])
+
+#if user_options_dict['USE_PHYSICS'] == 'solid':
+#    SConscript(['Physics/Sumo/SConscript'])
+#elif user_options_dict['USE_PHYSICS'] == 'ode':
+#    SConscript(['Physics/BlOde/SConscript'])