diff options
author | Simon Clitherow <aphex@nildram.co.uk> | 2005-08-02 01:19:41 +0400 |
---|---|---|
committer | Simon Clitherow <aphex@nildram.co.uk> | 2005-08-02 01:19:41 +0400 |
commit | 208da2a5d0eaf2f64f7b73d0b24b619d7546bf8d (patch) | |
tree | 242fcb58abef2c0e2af01cc1d9f03dbed6308fae /source/gameengine | |
parent | bc865d6d2098d82f9a00655b8aa89a326244db0a (diff) |
Added support for compiling BULLET with scons on windows
using bandoler's patch as a basis (thanks!).
A couple of notes:
- This is for windows only, I did not have a chance to try linux yet.
- SConscript for PHY_Bullet may need tweaking (plus support
for other platforms), but at least it's in there :)
Any problems, shout :)
Diffstat (limited to 'source/gameengine')
-rwxr-xr-x | source/gameengine/BlenderRoutines/SConscript | 2 | ||||
-rwxr-xr-x | source/gameengine/Converter/SConscript | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 6 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/SConscript | 22 | ||||
-rw-r--r-- | source/gameengine/SConscript | 2 |
5 files changed, 34 insertions, 0 deletions
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 6427c7c155f..f586e72ad44 100755 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -35,6 +35,7 @@ kx_blenderhook_env.Append (CPPPATH=['.', '#source/gameengine/Network', '#source/gameengine/SceneGraph', '#source/gameengine/Physics/common', + '#source/gameengine/Physics/Bullet', '#source/gameengine/Physics/Sumo', '#source/gameengine/Physics/Sumo/Fuzzics/include', '#source/gameengine/Network/LoopBackNetwork', @@ -45,6 +46,7 @@ kx_blenderhook_env.Append (CPPPATH=['.', kx_blenderhook_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) kx_blenderhook_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) +kx_blenderhook_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) kx_blenderhook_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) if sys.platform=='win32': diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 780295783d1..00908defdff 100755 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -49,6 +49,7 @@ kx_converter_env.Append (CPPPATH = ['.', '#source/gameengine/Network', '#source/gameengine/SceneGraph', '#source/gameengine/Physics/common', + '#source/gameengine/Physics/Bullet', '#source/gameengine/Physics/BlOde', '#source/gameengine/Physics/Dummy', '#source/gameengine/Physics/Sumo', @@ -60,5 +61,6 @@ kx_converter_env.Append (CPPPATH = ['.', kx_converter_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) kx_converter_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) +kx_converter_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files) diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 1b22231f3f9..aa74e4e29c7 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -68,6 +68,11 @@ 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', '#intern/string', @@ -97,6 +102,7 @@ ketsji_env.Append (CPPPATH = ['.', '#source/gameengine/Network', '#source/gameengine/SceneGraph', '#source/gameengine/Physics/common', + '#source/gameengine/Physics/Bullet', '#source/gameengine/Physics/BlOde', '#source/gameengine/Physics/Dummy', '#source/gameengine/Physics/Sumo', diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript new file mode 100644 index 00000000000..8d82f346757 --- /dev/null +++ b/source/gameengine/Physics/Bullet/SConscript @@ -0,0 +1,22 @@ +#!/usr/bin/python +import sys +Import ('user_options_dict') +Import ('library_env') + +phy_bullet_env = library_env.Copy () + +source_files = ['CcdPhysicsEnvironment.cpp', + 'CcdPhysicsController.cpp' + ] + +phy_bullet_env.Append (CPPPATH=['.', + '../common']) + +phy_bullet_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) + + +if sys.platform=='win32': + phy_bullet_env.Append (CXXFLAGS = ['/GR']) + phy_bullet_env.Append (CCFLAGS =['/O2']) + +phy_bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Bullet', source=source_files) diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript index 1b2c6316c61..496d9dc8f3c 100644 --- a/source/gameengine/SConscript +++ b/source/gameengine/SConscript @@ -22,3 +22,5 @@ if user_options_dict['USE_PHYSICS'] == 'solid': SConscript(['Physics/Sumo/SConscript']) elif user_options_dict['USE_PHYSICS'] == 'ode': SConscript(['Physics/BlOde/SConscript']) +elif user_options_dict['USE_PHYSICS'] == 'bullet': + SConscript(['Physics/Bullet/SConscript']) |