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 3783b926dfb9f7286d3082bb0b1e60364a4b6334..4faebf17260119b486ad743a983f070771c8570a 100644 (file)
--- a/tools/scons/bs/bs_libs.py
+++ b/tools/scons/bs/bs_libs.py
@@ -41,8 +41,11 @@ def international_libs(env):
                env.Append (LIBS=bs_globals.user_options_dict['FREETYPE_LIBRARY'])
                env.Append (LIBPATH=bs_globals.user_options_dict['FREETYPE_LIBPATH'])
                env.Append (LIBS=['blender_FTF'])
-               env.Append (LIBS=bs_globals.user_options_dict['FTGL_LIBRARY'])
-               env.Append (LIBPATH=bs_globals.user_options_dict['FTGL_LIBPATH'])
+               if sys.platform=='darwin':
+                       env.Append (LIBS=bs_globals.user_options_dict['FTGL_LIBRARY'])
+                       env.Append (LIBPATH=bs_globals.user_options_dict['FTGL_LIBPATH'])
+               else:
+                       env.Append (LIBS=['extern_ftgl'])
                env.Append (LIBS=bs_globals.user_options_dict['FREETYPE_LIBRARY'])
 
 def blender_libs(env):
@@ -55,11 +58,12 @@ def blender_libs(env):
                'blender_yafray',
                'blender_renderconverter',
                'blender_radiosity',
-               'blender_LOD',
                'blender_BSP',
                'blender_blenkernel',
+               'blender_LOD',
                'blender_IK',
-               'blender_ONL'])
+               'blender_ONL',
+               'blender_elbeem' ])
 
 def ketsji_libs(env):
        """
@@ -69,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',
@@ -102,7 +108,8 @@ def player_libs2(env):
        Link order shenannigans: these libs are added after common_libs
        """
        env.Append (LIBS=['blender_blenkernel_blc',
-                       'soundsystem'])
+                                         'blender_LOD',                                  
+                                         'soundsystem'])
 
 def winblenderres(env):
        """