diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-05-04 08:44:00 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-05-04 08:44:00 +0000 |
| commit | 2f52fee6ad2e8fc159d5dffb9441255d352598df (patch) | |
| tree | fe5b4f2489bac25c2b9f03ec4c068750bb0bbdb8 /src/plugins/Input/ffmpeg/CMakeLists.txt | |
| parent | 50df239245a3861e11f2473e25833c6f632e61d9 (diff) | |
| download | qmmp-2f52fee6ad2e8fc159d5dffb9441255d352598df.tar.gz qmmp-2f52fee6ad2e8fc159d5dffb9441255d352598df.tar.bz2 qmmp-2f52fee6ad2e8fc159d5dffb9441255d352598df.zip | |
ffmpeg plugin: fixed build scripts (thanks to Stefan Koelling)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@361 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/CMakeLists.txt')
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 6a41766ab..dd10aa2c7 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -29,29 +29,23 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libffmpeg and taglib PKGCONFIG(libavcodec LIBAVCODEC_INCLUDE_DIR LIBAVCODEC_LINK_DIR LIBAVCODEC_LINK_FLAGS LIBAVCODEC_CFLAGS) PKGCONFIG(libavformat LIBAVFORMAT_INCLUDE_DIR LIBAVFORMAT_LINK_DIR LIBAVFORMAT_LINK_FLAGS LIBAVFORMAT_CFLAGS) -PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS) IF(NOT LIBAVCODEC_LINK_FLAGS) SET(LIBAVCODEC_LINK_FLAGS -lavcodec) + SET(LIBAVCODEC_INCLUDE_DIR /usr/include/ffmpeg) ENDIF(NOT LIBAVCODEC_LINK_FLAGS) IF(NOT LIBAVFORMAT_LINK_FLAGS) SET(LIBAVFORMAT_LINK_FLAGS -lavformat) + SET(LIBAVFORMAT_INCLUDE_DIR /usr/include/ffmpeg) ENDIF(NOT LIBAVFORMAT_LINK_FLAGS) -IF(NOT TAGLIB_LINK_FLAGS) - SET(TAGLIB_LINK_FLAGS -ltag) - SET(TAGLIB_INCLUDE_DIR /usr/include/taglib) - SET(TAGLIB_CFLAGS -I/usr/include/taglib) -ENDIF(NOT TAGLIB_LINK_FLAGS) -include_directories(${FLAC_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR}) -link_directories(${FLAC_LINK_DIR} ${TAGLIB_LINK_DIR}) +include_directories(${LIBAVCODEC_INCLUDE_DIR} ${LIBAVFORMAT_INCLUDE_DIR}) +link_directories(${LIBAVCODEC_LINK_DIR} ${LIBAVFORMAT_LINK_DIR}) ADD_DEFINITIONS(${LIBAVCODEC_CFLAGS}) ADD_DEFINITIONS(${LIBAVFORMAT_CFLAGS}) -ADD_DEFINITIONS(${TAGLIB_CFLAGS}) - SET(libffmpeg_SRCS decoder_ffmpeg.cpp @@ -85,6 +79,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(ffmpeg SHARED ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS}) -target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${LIBAVCODEC_LINK_FLAGS} ${LIBAVFORMAT_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS}) +target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${LIBAVCODEC_LINK_FLAGS} ${LIBAVFORMAT_LINK_FLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) - |