diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-01-29 09:03:19 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-01-29 09:03:19 +0000 |
| commit | 2a3dc6d0cadcefbf1757c65c2633498bba389c1d (patch) | |
| tree | ffde32e92be69fa25a896371985636b3e93acfa4 | |
| parent | 47f1be7e4f2878f9b248401f60ac6160ac734e41 (diff) | |
| download | qmmp-2a3dc6d0cadcefbf1757c65c2633498bba389c1d.tar.gz qmmp-2a3dc6d0cadcefbf1757c65c2633498bba389c1d.tar.bz2 qmmp-2a3dc6d0cadcefbf1757c65c2633498bba389c1d.zip | |
ffmpeg plugin: win32 support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2572 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/Input.pro | 4 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpeg.pro | 35 |
2 files changed, 28 insertions, 11 deletions
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index 40317cf15..9228f90ab 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -15,12 +15,12 @@ contains(CONFIG, MODPLUG_PLUGIN){ SUBDIRS += modplug } -unix{ - contains(CONFIG, FFMPEG_PLUGIN){ SUBDIRS += ffmpeg } +unix{ + contains(CONFIG, AAC_PLUGIN){ SUBDIRS += aac } diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index 50b25f822..148f1f90e 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -8,20 +8,39 @@ SOURCES += decoder_ffmpeg.cpp \ decoderffmpegfactory.cpp \ settingsdialog.cpp \ ffmpegmetadatamodel.cpp -QMAKE_CLEAN = ../libffmpeg.so -TARGET = $$PLUGINS_PREFIX/Input/ffmpeg -QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so + INCLUDEPATH += ../../../ + + + CONFIG += release \ warn_on \ plugin \ link_pkgconfig TEMPLATE = lib -QMAKE_LIBDIR += ../../../../lib -LIBS += -lqmmp + +TARGET = $$PLUGINS_PREFIX/Input/ffmpeg + +unix { + isEmpty(LIB_DIR):LIB_DIR = /lib + target.path = $$LIB_DIR/qmmp/Input + INSTALLS += target + QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so + LIBS += -lqmmp + QMAKE_LIBDIR += ../../../../lib + PKGCONFIG += libavcodec libavformat libavutil +} + + +win32 { + HEADERS += ../../../../src/qmmp/metadatamodel.h \ + ../../../../src/qmmp/decoderfactory.h + QMAKE_LIBDIR += ../../../../bin + LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll +} DEFINES += __STDC_CONSTANT_MACROS -PKGCONFIG += libavcodec libavformat libavutil + TRANSLATIONS = translations/ffmpeg_plugin_ru.ts \ translations/ffmpeg_plugin_uk_UA.ts \ translations/ffmpeg_plugin_zh_CN.ts \ @@ -37,6 +56,4 @@ TRANSLATIONS = translations/ffmpeg_plugin_ru.ts \ translations/ffmpeg_plugin_es.ts RESOURCES = translations/translations.qrc -isEmpty(LIB_DIR):LIB_DIR = /lib -target.path = $$LIB_DIR/qmmp/Input -INSTALLS += target + |