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 | |
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')
-rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 8 | ||||
-rw-r--r-- | source/gameengine/Physics/Makefile | 5 | ||||
-rw-r--r-- | source/gameengine/SConscript | 5 |
4 files changed, 10 insertions, 12 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index e38ff77f76e..b1922e247d1 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -33,7 +33,11 @@ #define KX_CONVERTPHYSICSOBJECTS /* These are defined by the build system... */ +//but the build system is broken, because it doesn't allow for 2 or more defines at once. +//Please leave Sumo _AND_ Bullet enabled #define USE_SUMO_SOLID +#define USE_BULLET + //#define USE_ODE //on visual studio 7/8, always enable BULLET for now diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index aa74e4e29c7..7051f7e5541 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -57,7 +57,8 @@ source_files = ['KX_WorldIpoController.cpp', 'KX_CDActuator.cpp', 'KX_CameraIpoSGController.cpp', 'KX_CameraActuator.cpp', - 'KX_Camera.cpp' + 'KX_Camera.cpp', + 'KX_BulletPhysicsController.cpp' ] if user_options_dict['USE_PHYSICS'] == 'solid': @@ -68,10 +69,6 @@ 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', @@ -118,5 +115,6 @@ if sys.platform == 'win32': ketsji_env.Append ( CCFLAGS =['/Ox']) ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) ketsji_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) +ketsji_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files) diff --git a/source/gameengine/Physics/Makefile b/source/gameengine/Physics/Makefile index b88cedee8f2..62e433cb72c 100644 --- a/source/gameengine/Physics/Makefile +++ b/source/gameengine/Physics/Makefile @@ -35,10 +35,7 @@ include nan_definitions.mk SOURCEDIR = source/gameengine/Physics DIR = $(OCGDIR)/gameengine/blphys -DIRS = common Sumo Dummy +DIRS = common Sumo Dummy Bullet #DIRS += BlOde -ifeq ($(NAN_USE_BULLET), true) - DIRS += Bullet -endif include nan_subdirs.mk 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']) |