Merge with trunk revision 37149.
[blender-staging.git] / source / gameengine / Ketsji / CMakeLists.txt
index 1e61359d329c0e95315cd9dd2e82e6eff6e37d07..6fe793bd4753c6124a7fbe99ffb32635e31d1344 100644 (file)
@@ -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}")