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 /build_files | |
| parent | c22dcbdd646ca3fd5c4441f7491f54a64e6caacc (diff) | |
Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c35c73cbb46..8fbef8a0784 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -63,9 +63,9 @@ MACRO(SETUP_LIBDIRS) IF(WITH_SDL) LINK_DIRECTORIES(${SDL_LIBPATH}) ENDIF(WITH_SDL) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) LINK_DIRECTORIES(${FFMPEG_LIBPATH}) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_IMAGE_OPENEXR) LINK_DIRECTORIES(${OPENEXR_LIBPATH}) ENDIF(WITH_IMAGE_OPENEXR) @@ -75,18 +75,18 @@ MACRO(SETUP_LIBDIRS) IF(WITH_LCMS) LINK_DIRECTORIES(${LCMS_LIBPATH}) ENDIF(WITH_LCMS) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) LINK_DIRECTORIES(${QUICKTIME_LIBPATH}) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_OPENAL) LINK_DIRECTORIES(${OPENAL_LIBPATH}) ENDIF(WITH_OPENAL) IF(WITH_JACK) LINK_DIRECTORIES(${JACK_LIBPATH}) ENDIF(WITH_JACK) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) LINK_DIRECTORIES(${SNDFILE_LIBPATH}) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SAMPLERATE) LINK_DIRECTORIES(${LIBSAMPLERATE_LIBPATH}) ENDIF(WITH_SAMPLERATE) @@ -142,18 +142,18 @@ MACRO(SETUP_LIBLINKS IF(WITH_JACK) TARGET_LINK_LIBRARIES(${target} ${JACK_LIB}) ENDIF(WITH_JACK) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB}) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SAMPLERATE) TARGET_LINK_LIBRARIES(${target} ${LIBSAMPLERATE_LIB}) ENDIF(WITH_SAMPLERATE) IF(WITH_SDL) TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY}) ENDIF(WITH_SDL) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_IMAGE_TIFF) TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) ENDIF(WITH_IMAGE_TIFF) @@ -170,9 +170,9 @@ MACRO(SETUP_LIBLINKS IF(WITH_LCMS) TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) ENDIF(WITH_LCMS) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB}) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_OPENCOLLADA) IF(WIN32 AND NOT UNIX) FOREACH(loop_var ${OPENCOLLADA_LIB}) |