X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/blobdiff_plain/6ce7d18371f8d2d1319082ed3cef553de339a65c..745fc2f9d045508c4c822266dbe3a90274b3ec73:/source/gameengine/Ketsji/SConscript

diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index aa74e4e29c7..7051f7e5541 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -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)