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 /source/blender/imbuf | |
| parent | c22dcbdd646ca3fd5c4441f7491f54a64e6caacc (diff) | |
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 141833f70e1..e68b2d20fa3 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -101,24 +101,32 @@ IF(WITH_IMAGE_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_IMAGE_TIFF) - SET(INC ${INC} ${TIFF_INCLUDE_DIR}) + LIST(APPEND INC ${TIFF_INCLUDE_DIR}) ADD_DEFINITIONS(-DWITH_TIFF) ENDIF(WITH_IMAGE_TIFF) IF(WITH_IMAGE_OPENJPEG) - SET(INC ${INC} ${OPENJPEG_INC}) + LIST(APPEND INC ${OPENJPEG_INC}) ADD_DEFINITIONS(-DWITH_OPENJPEG) ENDIF(WITH_IMAGE_OPENJPEG) -IF(WITH_QUICKTIME) - SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) +IF(WITH_IMAGE_REDCODE) + LIST(APPEND INC ${REDCODE_INC}) + ADD_DEFINITIONS(-DWITH_REDCODE) +ENDIF(WITH_IMAGE_REDCODE) + +IF(WITH_CODEC_QUICKTIME) + LIST(APPEND INC + ../quicktime + ${QUICKTIME_INC} + ) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) - SET(INC ${INC} ${FFMPEG_INC}) +IF(WITH_CODEC_FFMPEG) + LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_IMAGE_DDS) ADD_DEFINITIONS(-DWITH_DDS) diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 0365b712f24..b4dd491452e 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -319,7 +319,7 @@ static int isffmpeg (const char *filename) { #endif #ifdef WITH_REDCODE -static int isredcode(char * filename) +static int isredcode(const char * filename) { struct redcode_handle * h = redcode_open(filename); if (!h) { |