diff options
| -rw-r--r-- | SConstruct | 11 | ||||
| -rw-r--r-- | tools/scons/bs/bs_libs.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index e4bee7c6f87..a00dae683e7 100644 --- a/SConstruct +++ b/SConstruct @@ -357,9 +357,9 @@ elif sys.platform == 'win32': use_openal = 'true' use_fmod = 'false' use_quicktime = 'true' + use_bullet = 'true' use_sumo = 'true' use_ode = 'false' - use_bullet = 'true' use_buildinfo = 'true' use_fluidsim = 'true' build_blender_dynamic = 'true' @@ -371,7 +371,8 @@ elif sys.platform == 'win32': extra_flags = ['/EHsc', '/J', '/W3', '/Gd', '/MT'] cxxflags = [] defines = ['WIN32', '_CONSOLE'] - defines += ['WITH_QUICKTIME'] + if use_quicktime == 'true': + defines += ['WITH_QUICKTIME'] defines += ['_LIB', 'USE_OPENAL'] defines += ['FTGL_LIBRARY_STATIC'] warn_flags = [] @@ -439,9 +440,9 @@ elif sys.platform == 'win32': ode_libpath = ['#../lib/windows/ode/lib'] ode_include = ['#../lib/windows/ode/include'] # Python lib name - python_include = ['#../lib/windows/python/include/python2.3'] + python_include = ['#../lib/windows/python/include/python2.4'] python_libpath = ['#../lib/windows/python/lib'] - python_lib = ['python23'] + python_lib = ['python24'] python_linkflags = [] # International stuff ftgl_lib = [] @@ -850,7 +851,7 @@ else: config.write ("BUILD_GAMEENGINE = %r\n"%(use_gameengine)) if use_ode == 'true': config.write ("USE_PHYSICS = 'ode'\n") - elif use_bullet == 'true': + elif (use_bullet == 'true') and (use_sumo == 'false'): config.write("USE_PHYSICS = 'bullet'\n") else: config.write ("USE_PHYSICS = 'solid'\n") diff --git a/tools/scons/bs/bs_libs.py b/tools/scons/bs/bs_libs.py index 4faebf17260..3a818027d1d 100644 --- a/tools/scons/bs/bs_libs.py +++ b/tools/scons/bs/bs_libs.py @@ -90,7 +90,7 @@ 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']) - else: + elif bs_globals.user_options_dict['USE_PHYSICS'] == 'ode': env.Append (LIBS=['PHY_Ode', 'PHY_Physics']) env.Append (LIBS=bs_globals.user_options_dict['ODE_LIBRARY']) |