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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 929856d1de9..e4bee7c6f87 100644 --- a/SConstruct +++ b/SConstruct @@ -69,7 +69,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386': use_quicktime = 'false' use_sumo = 'true' use_ode = 'false' - use_bullet = 'false' + use_bullet = 'true' use_buildinfo = 'true' use_fluidsim = 'true' build_blender_dynamic = 'true' @@ -156,7 +156,7 @@ elif sys.platform == 'darwin': use_precomp = 'true' use_sumo = 'true' use_ode = 'false' - use_bullet = 'false' + use_bullet = 'true' use_buildinfo = 'true' use_fluidsim = 'true' build_blender_dynamic = 'true' @@ -359,7 +359,7 @@ elif sys.platform == 'win32': use_quicktime = 'true' use_sumo = 'true' use_ode = 'false' - use_bullet = 'false' + use_bullet = 'true' use_buildinfo = 'true' use_fluidsim = 'true' build_blender_dynamic = 'true' @@ -1046,10 +1046,9 @@ bs_globals.config_guess = config_guess if user_options_dict['BUILD_GAMEENGINE'] == 1: defines += ['GAMEBLENDER=1'] + defines += ['USE_BULLET'] if user_options_dict['USE_PHYSICS'] == 'ode': defines += ['USE_ODE'] - elif user_options_dict['USE_PHYSICS'] == 'bullet': - defines += ['USE_BULLET'] else: defines += ['USE_SUMO_SOLID'] else: |