diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-09-09 17:16:05 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-09-09 17:16:05 +0000 |
| commit | f14378d51d27354b94c6367af9c917483e4a7a8e (patch) | |
| tree | 5af7414b03a083330c892526824de8ce2b49bea5 | |
| parent | 66f6d57a08972314ede4efd3e3eec583ff1d1bb0 (diff) | |
| download | qmmp-f14378d51d27354b94c6367af9c917483e4a7a8e.tar.gz qmmp-f14378d51d27354b94c6367af9c917483e4a7a8e.tar.bz2 qmmp-f14378d51d27354b94c6367af9c917483e4a7a8e.zip | |
new ffmpeg support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@543 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpeg.pro | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 846fd66fe..a97c78bad 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -21,11 +21,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) SET(QT_INCLUDES ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ + ${CMAKE_CURRENT_BINARY_DIR}/../../../ ) # libqmmp -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libffmpeg @@ -33,17 +33,24 @@ pkg_check_modules(FFMPEG libavcodec libavformat) # old ffmpeg support -IF(EXISTS /usr/include/ffmpeg/avformat.h) + +IF(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) + ADD_DEFINITIONS(-DHAVE_FFMPEG_AVFORMAT_H) + include_directories(/usr/include/ffmpeg) +ELSEIF(EXISTS /usr/include/ffmpeg/avformat.h) ADD_DEFINITIONS(-DHAVE_FFMPEG_AVFORMAT_H) ELSEIF(EXISTS /usr/include/libavformat/avformat.h) ADD_DEFINITIONS(-DHAVE_LIBAVFORMAT_AVFORMAT_H) -ELSE(EXISTS /usr/include/libavformat/avformat.h) +ELSE(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) include_directories(/usr/local/include/ffmpeg /usr/local/include/libavformat ) -ENDIF(EXISTS /usr/include/ffmpeg/avformat.h) +ENDIF(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) -IF(EXISTS /usr/include/ffmpeg/avcodec.h) +IF(EXISTS /usr/include/ffmpeg/libavcodec/avcodec.h) + ADD_DEFINITIONS(-DHAVE_FFMPEG_AVCODEC_H) + include_directories(/usr/include/ffmpeg) +ELSEIF(EXISTS /usr/include/ffmpeg/avcodec.h) ADD_DEFINITIONS(-DHAVE_FFMPEG_AVCODEC_H) ELSEIF(EXISTS /usr/include/libavcodec/avcodec.h) ADD_DEFINITIONS(-DHAVE_LIBAVCODEC_AVCODEC_H) @@ -51,7 +58,7 @@ ELSE(EXISTS /usr/include/ffmpeg/avcodec.h) include_directories(/usr/local/include/ffmpeg /usr/local/include/libavcodec ) -ENDIF(EXISTS /usr/include/ffmpeg/avcodec.h) +ENDIF(EXISTS /usr/include/ffmpeg/libavcodec/avcodec.h) include_directories(${FFMPEG_INCLUDE_DIRS}) @@ -93,7 +100,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg SHARED ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS}) -add_dependencies(ffmpeg qmmp) target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS} ${FFMPEG_CFLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_FOUND) diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index 940bd9b85..c6e2e6699 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -18,6 +18,8 @@ QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libffmpeg.so INCLUDEPATH += ../../../ INCLUDEPATH += /usr/include/libavformat INCLUDEPATH += /usr/include/libavcodec +INCLUDEPATH += /usr/include/ffmpeg/libavcodec +INCLUDEPATH += /usr/include/ffmpeg/libavformat CONFIG += release \ warn_on \ |