bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

applied patch [ #3260 ] Enable compile bullet and sumo with scons

Browse Source
This commit is contained in:
Erwin Coumans 2005-10-28 04:48:01 +00:00
parent b729020276
commit 0dde486eea
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SConstruct
View File

@ -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")

2
tools/scons/bs/bs_libs.py
View File

@ -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'])