diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-23 19:58:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-23 19:58:41 +0400 |
| commit | bb3742fe91367196c14c4a5cb71245352e9f4fdf (patch) | |
| tree | e363f67166190779b83fecb0f297702f93104e45 | |
| parent | c3e48219e6aa3806ec0f8b89e2919f3d11596ef4 (diff) | |
correction to recent commit & made ffmpeg includes only add when enabled.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/CMakeLists.txt | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 94a7740fd7b..ebda75a6bed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index e193bd0830f..a19d48daa75 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -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() diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 14679b37d1e..c9a8f62a197 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -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() diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index fbaa1a9765d..28f567cc3cd 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -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() |