diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-30 21:52:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-30 21:52:39 +0300 |
| commit | 42d6603caeb18e36b723f38e83f6e8fff3a6cd8c (patch) | |
| tree | cd8838d9271d9013f30f20d8d5a12bb3c8a010ab /intern | |
| parent | c22dcbdd646ca3fd5c4441f7491f54a64e6caacc (diff) | |
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index a9f5030cd86..440233eacbc 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -153,7 +153,7 @@ SET(SRC FX/AUD_VolumeFactory.h ) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) LIST(APPEND INC ffmpeg ${FFMPEG_INC}) SET(FFMPEGSRC @@ -163,7 +163,7 @@ IF(WITH_FFMPEG) ffmpeg/AUD_FFMPEGFactory.h ffmpeg/AUD_FFMPEGReader.h ) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_SDL) ADD_DEFINITIONS(-DWITH_SDL) @@ -195,7 +195,7 @@ IF(WITH_JACK) ) ENDIF(WITH_JACK) -IF(WITH_SNDFILE) +IF(WITH_CODEC_SNDFILE) ADD_DEFINITIONS(-DWITH_SNDFILE) LIST(APPEND INC sndfile ${SNDFILE_INC}) SET(SNDFILESRC @@ -205,7 +205,7 @@ IF(WITH_SNDFILE) sndfile/AUD_SndFileFactory.h sndfile/AUD_SndFileReader.h ) -ENDIF(WITH_SNDFILE) +ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SAMPLERATE) ADD_DEFINITIONS(-DWITH_SAMPLERATE) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index a93f5e1a362..fa0a3eea393 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -105,9 +105,9 @@ IF(APPLE) ) ENDIF(WITH_COCOA) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) ELSEIF(UNIX) LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) |