diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-06-04 03:24:01 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-04 03:24:01 +0400 |
commit | cd04cff1800e8f60a06d8da6e79ac436808c9a7d (patch) | |
tree | 8c6aa631dab983e845ff8626725537d8b71dc9e4 /source/gameengine/Ketsji/CMakeLists.txt | |
parent | 71419c46471586e93884aa151f5b160863025886 (diff) | |
parent | d84c6a3cdb60c4e31db75efc4c6f9a3ea9e9f034 (diff) |
Merge with trunk revision 37149.
Diffstat (limited to 'source/gameengine/Ketsji/CMakeLists.txt')
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 1e61359d329..6fe793bd475 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -54,6 +54,9 @@ set(INC ../../../intern/audaspace/intern ../../../source/blender/blenloader ../../../source/blender/gpu +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -212,7 +215,7 @@ set(SRC add_definitions(-DGLEW_STATIC) if(WITH_SDL) - set(INC ${INC} ${SDL_INCLUDE_DIR}) + list(APPEND INC_SYS ${SDL_INCLUDE_DIR}) else() add_definitions(-DDISABLE_SDL) endif() @@ -222,9 +225,11 @@ if(WITH_CODEC_FFMPEG) endif() if(WITH_BULLET) + list(APPEND INC + ../../../extern/bullet2/src + ../../../source/gameengine/Physics/Bullet + ) add_definitions(-DUSE_BULLET) - list(APPEND INC ../../../extern/bullet2/src) - list(APPEND INC ../../../source/gameengine/Physics/Bullet ) endif() -blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}") +blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}" "${INC_SYS}") |