updated SConstruct and Makefile so that if you compile the gameengine, is always...
[blender.git] / source / gameengine / Ketsji / SConscript
index aa74e4e29c7e6eecc90ecbc71720da8dd70136b4..7051f7e55411dc92054ccbd199c98d788bf2a8ca 100644 (file)
@@ -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)