From 1b09386164535948e1de88fc9deb1eee4b3f2429 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 21 Nov 2006 06:37:01 +0000 Subject: [PATCH] updated CMake files for game engine for Bullet 2.x upgrade --- source/gameengine/BlenderRoutines/CMakeLists.txt | 4 +--- source/gameengine/Converter/CMakeLists.txt | 4 +--- source/gameengine/Ketsji/CMakeLists.txt | 4 +--- source/gameengine/Physics/Bullet/CMakeLists.txt | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index e6e8b9856fe..764be732343 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -31,9 +31,7 @@ SET(INC ../../../intern/SoundSystem ../../../source/blender/misc ../../../source/blender/blenloader - ../../../extern/bullet/LinearMath - ../../../extern/bullet/BulletDynamics - ../../../extern/bullet/Bullet + ../../../extern/bullet2/src ../../../extern/solid ${PYTHON_INC} ) diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 214fd5484e7..db516b20df2 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -67,9 +67,7 @@ SET(INC ../../../source/gameengine/Network/LoopBackNetwork ../../../source/blender/misc ../../../source/blender/blenloader - ../../../extern/bullet/LinearMath - ../../../extern/bullet/BulletDynamics - ../../../extern/bullet/Bullet + ../../../extern/bullet2/src ../../../extern/solid ${PYTHON_INC} ) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 09dff5ce58d..ca21869c007 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -60,9 +60,7 @@ SET(INC ../../../intern/SoundSystem ../../../source/blender/misc ../../../source/blender/blenloader - ../../../extern/bullet/LinearMath - ../../../extern/bullet/BulletDynamics - ../../../extern/bullet/Bullet + ../../../extern/bullet2/src ../../../extern/solid ${PYTHON_INC} ${SDL_INC} diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt index d41f9e06ec3..af67d4b126d 100644 --- a/source/gameengine/Physics/Bullet/CMakeLists.txt +++ b/source/gameengine/Physics/Bullet/CMakeLists.txt @@ -32,9 +32,7 @@ SET(SRC CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp) SET(INC . ../common - ../../../../extern/bullet/LinearMath - ../../../../extern/bullet/BulletDynamics - ../../../../extern/bullet/Bullet + ../../../../extern/bullet2/src ) BLENDERLIB(bf_bullet "${SRC}" "${INC}")