diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-10 11:01:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-10 11:01:56 +0400 |
| commit | f49fc58df63d42ab451380ea92e55b1265d14e4e (patch) | |
| tree | 026f338d863a838844ba443f39056c01aa3be004 /source/gameengine/Converter | |
| parent | d420d09da982e1a874ffe2b0612b8fdd0afc980e (diff) | |
enable building the game engine without bullet for scons & cmake
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/SConscript | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index f9bca9a2cdd..69483aed1ec 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1766,9 +1766,11 @@ static KX_GameObject *gameobject_from_blenderobject( BL_MeshDeformer *dcont = new BL_MeshDeformer((BL_DeformableGameObject*)gameobj, ob, meshobj); ((BL_DeformableGameObject*)gameobj)->SetDeformer(dcont); +#ifdef USE_BULLET } else if (bHasSoftBody) { KX_SoftBodyDeformer *dcont = new KX_SoftBodyDeformer(meshobj, (BL_DeformableGameObject*)gameobj); ((BL_DeformableGameObject*)gameobj)->SetDeformer(dcont); +#endif } MT_Point3 min = MT_Point3(center) - MT_Vector3(extents); diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index c5b8128903b..87e413c3a44 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -69,4 +69,8 @@ ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) +IF(WITH_BULLET) + ADD_DEFINITIONS(-DUSE_BULLET) +ENDIF(WITH_BULLET) + BLENDERLIB(bf_converter "${SRC}" "${INC}") diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 7701d27730b..a276d1623df 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -35,4 +35,7 @@ else: if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') +if env['WITH_BF_BULLET']: + defs.append('USE_BULLET') + env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS']) |