diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
| commit | 00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 (patch) | |
| tree | 952bb1c2f6fd8c2f34b950597ed0fa73a4ea7594 /source/gameengine/Ketsji/SConscript | |
| parent | 5b90aafbd6815e29343f8e9aba9e3e20f85b3cc0 (diff) | |
[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process
[SCons] Build solid and qhull from the extern directory and link statically against them
That was about it.
There are a few things that needs double checking:
* Makefiles
* Projectfiles
* All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
Diffstat (limited to 'source/gameengine/Ketsji/SConscript')
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index fddf4762013..4789138d1c2 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -1,3 +1,5 @@ +import sys + Import ('user_options_dict') Import ('library_env') @@ -59,6 +61,7 @@ if user_options_dict['USE_PHYSICS'] == 'solid': if user_options_dict['USE_PHYSICS'] == 'ode': source_files += ['KX_OdePhysicsController.cpp'] + ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) ketsji_env.Append (CPPPATH = ['.', '#source/kernel/gen_system', @@ -90,7 +93,7 @@ ketsji_env.Append (CPPPATH = ['.', '#source/gameengine/Physics/common', '#source/gameengine/Physics/BlOde', '#source/gameengine/Physics/Dummy', - '#source/gameengine/Physics/Sumo/', + '#source/gameengine/Physics/Sumo', '#source/gameengine/Physics/Sumo/include', '#source/gameengine/Physics/Sumo/Fuzzics/include', '#source/gameengine/Network/LoopBackNetwork', @@ -98,6 +101,8 @@ ketsji_env.Append (CPPPATH = ['.', '#source/blender/blenloader' ]) +if sys.platform == 'win32': + ketsji_env.Append (CXXFLAGS = ['/GR']) ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files) |