aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-10 18:28:10 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-10 18:28:10 +0000
commit8ec094214b1cc94a1b560e37f0c95e0e0eb54900 (patch)
treeb163caf6cebf59a03f7e5f418660a8b5cafe8a50
parent93e119d0fbf1011b0753ea89ae373c21c96e5467 (diff)
downloadqmmp-8ec094214b1cc94a1b560e37f0c95e0e0eb54900.tar.gz
qmmp-8ec094214b1cc94a1b560e37f0c95e0e0eb54900.tar.bz2
qmmp-8ec094214b1cc94a1b560e37f0c95e0e0eb54900.zip
updated cmake files
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3222 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/plugins/Input/CMakeLists.txt31
2 files changed, 20 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 261fefab0..f72c1d136 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,8 @@ PRINT_SUMMARY ("Musepack support .................." USE_MPC MPC_FOUND)
PRINT_SUMMARY ("MOD support ......................." USE_MODPLUG MODPLUG_FOUND)
PRINT_SUMMARY ("Wave support ......................" USE_SNDFILE SNDFILE_FOUND)
PRINT_SUMMARY ("WavPack support ..................." USE_WAVPACK WAVPACK_FOUND)
-PRINT_SUMMARY ("FFmpeg support ...................." USE_FFMPEG FFMPEG_FOUND)
+PRINT_SUMMARY ("FFmpeg/Libav support .............." USE_FFMPEG FFMPEG_FOUND)
+PRINT_SUMMARY ("FFmpeg 0.6-0.8 support ............" USE_FFMPEG_LEGACY FFMPEG_LEGACY_FOUND)
PRINT_SUMMARY ("AAC support ......................." USE_AAC FAAD_FOUND)
PRINT_SUMMARY ("CUE sheet support ................." USE_CUE 1)
PRINT_SUMMARY ("Mplayer support ..................." USE_MPLAYER 1)
diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt
index ed57dcd17..ba943f1ff 100644
--- a/src/plugins/Input/CMakeLists.txt
+++ b/src/plugins/Input/CMakeLists.txt
@@ -1,17 +1,18 @@
-SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin")
-SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin")
-SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin")
-SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin")
-SET(USE_MPC TRUE CACHE BOOL "enable/disable mpc plugin")
-SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin")
-SET(USE_WAVPACK TRUE CACHE BOOL "enable/disable wavpack plugin")
-SET(USE_MODPLUG TRUE CACHE BOOL "enable/disable modplug plugin")
-SET(USE_AAC TRUE CACHE BOOL "enable/disable aac plugin")
-SET(USE_CUE TRUE CACHE BOOL "enable/disable cue plugin")
-SET(USE_CDA TRUE CACHE BOOL "enable/disable cd audio support")
-SET(USE_MIDI TRUE CACHE BOOL "enable/disable midi support")
-SET(USE_GME TRUE CACHE BOOL "enable/disable game music plugin")
+SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin")
+SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin")
+SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin")
+SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin")
+SET(USE_FFMPEG_LEGACY TRUE CACHE BOOL "enable/disable ffmpeg_legacy plugin")
+SET(USE_MPC TRUE CACHE BOOL "enable/disable mpc plugin")
+SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin")
+SET(USE_WAVPACK TRUE CACHE BOOL "enable/disable wavpack plugin")
+SET(USE_MODPLUG TRUE CACHE BOOL "enable/disable modplug plugin")
+SET(USE_AAC TRUE CACHE BOOL "enable/disable aac plugin")
+SET(USE_CUE TRUE CACHE BOOL "enable/disable cue plugin")
+SET(USE_CDA TRUE CACHE BOOL "enable/disable cd audio support")
+SET(USE_MIDI TRUE CACHE BOOL "enable/disable midi support")
+SET(USE_GME TRUE CACHE BOOL "enable/disable game music plugin")
IF(USE_MAD AND TAGLIB_FOUND)
@@ -30,6 +31,10 @@ IF(USE_FFMPEG)
add_subdirectory(ffmpeg)
ENDIF(USE_FFMPEG)
+IF(USE_FFMPEG_LEGACY)
+add_subdirectory(ffmpeg_legacy)
+ENDIF(USE_FFMPEG_LEGACY)
+
IF(USE_MPC AND TAGLIB_FOUND)
add_subdirectory(mpc)
ENDIF(USE_MPC AND TAGLIB_FOUND)