diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2005-10-23 21:55:19 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2005-10-23 21:55:19 +0400 |
| commit | 745fc2f9d045508c4c822266dbe3a90274b3ec73 (patch) | |
| tree | 7578e1fb20d3fcab16594ca1c519997ee5c21b67 /source/gameengine/SConscript | |
| parent | 6ce7d18371f8d2d1319082ed3cef553de339a65c (diff) | |
updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.
So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.
sorry if this breaks your builds!
Diffstat (limited to 'source/gameengine/SConscript')
| -rw-r--r-- | source/gameengine/SConscript | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript index 496d9dc8f3c..ca4283944b5 100644 --- a/source/gameengine/SConscript +++ b/source/gameengine/SConscript @@ -13,7 +13,8 @@ SConscript(['BlenderRoutines/SConscript', 'Physics/Dummy/SConscript', 'Rasterizer/SConscript', 'Rasterizer/RAS_OpenGLRasterizer/SConscript', - 'SceneGraph/SConscript']) + 'SceneGraph/SConscript', + 'Physics/Bullet/SConscript']) if user_options_dict['BUILD_BLENDER_PLAYER']: SConscript(['GamePlayer/SConscript']) @@ -22,5 +23,3 @@ 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']) |