Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-10 11:01:56 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-10 11:01:56 +0400
commitf49fc58df63d42ab451380ea92e55b1265d14e4e (patch)
tree026f338d863a838844ba443f39056c01aa3be004 /source/gameengine/Physics
parentd420d09da982e1a874ffe2b0612b8fdd0afc980e (diff)
enable building the game engine without bullet for scons & cmake
Diffstat (limited to 'source/gameengine/Physics')
-rw-r--r--source/gameengine/Physics/Bullet/CMakeLists.txt4
-rw-r--r--source/gameengine/Physics/Bullet/SConscript3
2 files changed, 7 insertions, 0 deletions
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 95888967b78..ba6f3bef0db 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -46,4 +46,8 @@ SET(INC
${PYTHON_INC}
)
+IF(WITH_BULLET)
+ ADD_DEFINITIONS(-DUSE_BULLET)
+ENDIF(WITH_BULLET)
+
BLENDERLIB(bf_bullet "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 6beb044671c..6cebe0638b0 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -30,4 +30,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_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])