diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
| commit | 4532bd731d5edbe348d4df810856f6bdfdea705c (patch) | |
| tree | 778fdcd594b5f384eacf5cd82f50afc10bbed513 /source/gameengine/Ketsji/CMakeLists.txt | |
| parent | cf34f7509f4ea8c3f0c92045933f089c72de5313 (diff) | |
| parent | bbfe3c9c49523d3987a3144da119d8f6afd09cf9 (diff) | |
Merge with trunk up to r38584.
Diffstat (limited to 'source/gameengine/Ketsji/CMakeLists.txt')
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index ecb73cb0ae9..f10347e5473 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -26,7 +26,29 @@ set(INC . - ../../../intern/string + KXNetwork + ../BlenderRoutines + ../Converter + ../Expressions + ../GameLogic + ../Network + ../Network/LoopBackNetwork + ../Physics/common + ../Rasterizer + ../Rasterizer/RAS_OpenGLRasterizer + ../SceneGraph + ../../blender + ../../blender/blenfont + ../../blender/blenkernel + ../../blender/blenlib + ../../blender/blenloader + ../../blender/gpu + ../../blender/imbuf + ../../blender/makesdna + ../../blender/python + ../../blender/python/generic + ../../blender/python/mathutils + ../../../intern/container ../../../intern/guardedalloc ../../../intern/container ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer @@ -34,6 +56,7 @@ set(INC ../../../source/gameengine/BlenderRoutines ../../../source/blender/imbuf ../../../intern/moto/include + ../../../intern/string ../../../source/gameengine/Ketsji ../../../source/blender/blenlib ../../../source/blender/blenfont @@ -133,6 +156,10 @@ set(SRC BL_Action.h BL_ActionManager.h + BL_BlenderShader.h + BL_Material.h + BL_Shader.h + BL_Texture.h KX_ArmatureSensor.h KX_BlenderMaterial.h KX_BulletPhysicsController.h @@ -205,16 +232,14 @@ set(SRC KX_VisibilityActuator.h KX_WorldInfo.h KX_WorldIpoController.h - BL_BlenderShader.h - BL_Material.h - BL_Shader.h - BL_Texture.h ) add_definitions(-DGLEW_STATIC) if(WITH_SDL) - list(APPEND INC_SYS ${SDL_INCLUDE_DIR}) + list(APPEND INC_SYS + ${SDL_INCLUDE_DIR} + ) else() add_definitions(-DDISABLE_SDL) endif() @@ -233,7 +258,7 @@ endif() if(WITH_BULLET) list(APPEND INC ../../../extern/bullet2/src - ../../../source/gameengine/Physics/Bullet + ../Physics/Bullet ) add_definitions(-DUSE_BULLET) endif() |