Merging r37732 through r37862 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index e050d8a6d9e739244c0562344ce6d93cc489078f..ee6b3d7aa3bee84764762b1473a40e00bc71d2d0 100644 (file)
@@ -43,8 +43,6 @@ set(INC
        ../nodes
        ../editors/include
        ../render/extern/include
-       ../../../intern/audaspace/intern
-       ../../../intern/ffmpeg
        ../../../intern/bsp/extern ../blenfont
        ../../../intern/decimation/extern
        ../../../intern/elbeem/extern
@@ -243,6 +241,13 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
+if(WITH_AUDASPACE)
+       list(APPEND INC
+               ../../../intern/audaspace/intern
+       )
+       add_definitions(-DWITH_AUDASPACE)
+endif()
+
 if(WITH_BULLET)
        list(APPEND INC ../../../extern/bullet2/src)
        add_definitions(-DUSE_BULLET)
@@ -284,6 +289,7 @@ if(WITH_CODEC_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
+       list(APPEND INC ../../../intern/ffmpeg)
        list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
        add_definitions(-DWITH_FFMPEG)
 endif()