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

[blender.git] / tools / scons / bs / bs_libs.py

diff --git a/tools/scons/bs/bs_libs.py b/tools/scons/bs/bs_libs.py
index b62879478eff3ba779cdcc044d702ffd905bb852..4faebf17260119b486ad743a983f070771c8570a 100644 (file)
--- a/tools/scons/bs/bs_libs.py
+++ b/tools/scons/bs/bs_libs.py
@@ -73,7 +73,9 @@ def ketsji_libs(env):
                env.Append (LIBS=['KX_blenderhook',
                                'KX_converter',
                                'PHY_Dummy',
+                               'PHY_Bullet',
                                'PHY_Physics',
+                               'extern_bullet',
                                'KX_ketsji',
                                'SCA_GameLogic',
                                'RAS_rasterizer',
@@ -88,8 +90,6 @@ def ketsji_libs(env):
                                'NG_loopbacknetwork'])
                if bs_globals.user_options_dict['USE_PHYSICS'] == 'solid':
                        env.Append (LIBS=['PHY_Sumo', 'PHY_Physics', 'blender_MT', 'extern_solid', 'extern_qhull'])
-               elif bs_globals.user_options_dict['USE_PHYSICS'] == 'bullet':
-                       env.Append (LIBS=['PHY_Bullet', 'PHY_Physics', 'blender_MT','extern_bullet'])
                else:
                        env.Append (LIBS=['PHY_Ode',
                                        'PHY_Physics'])