correction to recent commit & made ffmpeg includes only add when enabled.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Jun 2011 15:58:41 +0000 (15:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Jun 2011 15:58:41 +0000 (15:58 +0000)
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt

index 94a7740..ebda75a 100644 (file)
@@ -203,8 +203,8 @@ if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
        message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
-       message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR WITH_CODEC_FFMPEG))
+       message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
 endif()
 
 if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
index e193bd0..a19d48d 100644 (file)
@@ -43,7 +43,6 @@ set(INC
        ../nodes
        ../editors/include
        ../render/extern/include
-       ../../../intern/ffmpeg
        ../../../intern/bsp/extern ../blenfont
        ../../../intern/decimation/extern
        ../../../intern/elbeem/extern
@@ -284,6 +283,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()
index 14679b3..c9a8f62 100644 (file)
@@ -38,7 +38,6 @@ set(INC
        ../makesdna
        ../../../intern/memutil
        ../../../intern/guardedalloc
-       ../../../intern/ffmpeg
 )
 
 set(INC_SYS
@@ -135,6 +134,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()
index fbaa1a9..28f567c 100644 (file)
@@ -59,13 +59,13 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_AUDASPACE)
+       list(APPEND INC
+               ../../../intern/audaspace/intern
+       )
        add_definitions(-DWITH_AUDASPACE)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC
-               ../../../intern/audaspace/intern
-       )
        add_definitions(-DWITH_FFMPEG)
 endif()