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 | |
parent | c22dcbdd646ca3fd5c4441f7491f54a64e6caacc (diff) |
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/blenpluginapi/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 24 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 8 |
9 files changed, 37 insertions, 29 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 7f4ed753956..470f395353c 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -54,9 +54,9 @@ IF(WITH_IMAGE_CINEON) ADD_SUBDIRECTORY(imbuf/intern/cineon) ENDIF(WITH_IMAGE_CINEON) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) ADD_SUBDIRECTORY(quicktime) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_PYTHON) ADD_SUBDIRECTORY(python) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 5ab4dbf0ba5..583f0327e07 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -256,15 +256,15 @@ IF(WITH_IMAGE_HDR) ADD_DEFINITIONS(-DWITH_HDR) ENDIF(WITH_IMAGE_HDR) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_LCMS) LIST(APPEND INC ${LCMS_INCLUDE_DIR}) diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index d9b15cf8ec1..0e2e8526747 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -44,9 +44,9 @@ SET(SRC util.h ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index eed0b0d435b..670fa55d998 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -45,10 +45,10 @@ SET(SRC render_intern.h ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) 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) { diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index a464e9124b7..bf9ba2dcc70 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -100,15 +100,15 @@ IF(WITH_IMAGE_HDR) ADD_DEFINITIONS(-DWITH_HDR) ENDIF(WITH_IMAGE_HDR) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../../quicktime) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_LCMS) LIST(APPEND INC ${LCMS_INCLUDE_DIR}) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index cf1d163a21c..fd3621a4cf8 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -115,10 +115,10 @@ IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(APPLE) IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 77c055e9c08..b6920a02bfa 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -85,15 +85,15 @@ IF(WITH_OPENCOLLADA) ADD_DEFINITIONS(-DWITH_COLLADA) ENDIF(WITH_OPENCOLLADA) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_PYTHON) LIST(APPEND INC ../python ${PYTHON_INC}) |