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/creator | |
| parent | c22dcbdd646ca3fd5c4441f7491f54a64e6caacc (diff) | |
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9f3106153ee..9a94b49c5c2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -42,9 +42,9 @@ INCLUDE_DIRECTORIES( ../blender/windowmanager ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) @@ -361,7 +361,7 @@ IF(WITH_INSTALL) ENDIF(CMAKE_CL_64) ENDIF(WITH_INTERNATIONAL) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD MAIN_DEPENDENCY blender @@ -371,15 +371,15 @@ IF(WITH_INSTALL) COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\" COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\" ) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND copy /Y \"${LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\" ) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_JACK) ADD_CUSTOM_COMMAND(TARGET blender @@ -562,6 +562,7 @@ ENDIF(WITH_MOD_FLUID) bf_intern_moto extern_glew extern_openjpeg + extern_redcode ge_videotex bf_rna bf_dna @@ -581,9 +582,9 @@ ENDIF(WITH_MOD_FLUID) LIST(APPEND BLENDER_SORTED_LIBS bf_intern_itasc) ENDIF(WITH_IK_ITASC) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) |