diff options
Diffstat (limited to 'src/plugins')
70 files changed, 130 insertions, 616 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro index 8e6612e47..d8aa5135a 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro @@ -1,20 +1,14 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET =$$PLUGINS_PREFIX/CommandLineOptions/incdecvolumeoption QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libincdecvolumeoption.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui HEADERS += incdecvolumeoption.h diff --git a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro index c6f26b781..37dbd9cc3 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro +++ b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro @@ -1,20 +1,14 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET =$$PLUGINS_PREFIX/CommandLineOptions/playlistoption QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libplaylistoption.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui HEADERS += playlistoption.h diff --git a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro index a3cbd7c92..3b645e3dd 100644 --- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro +++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro @@ -1,20 +1,14 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET = $$PLUGINS_PREFIX/CommandLineOptions/seekoption QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libseekoption.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui HEADERS += seekoption.h diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro index 8d9943f3e..fc60cbdb9 100644 --- a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro +++ b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro @@ -1,20 +1,14 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET = $$PLUGINS_PREFIX/CommandLineOptions/statusoption QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libstatusoption.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui HEADERS += statusoption.h diff --git a/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro b/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro index d84f8b86e..f98c1ee00 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro +++ b/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro @@ -1,16 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET = $$PLUGINS_PREFIX/CommandLineOptions/uninstalloption -TEMPLATE = lib - RESOURCES = translations/translations.qrc -LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui HEADERS += uninstalloption.h diff --git a/src/plugins/Effect/bs2b/bs2b.pro b/src/plugins/Effect/bs2b/bs2b.pro index 388e26348..8378b9943 100644 --- a/src/plugins/Effect/bs2b/bs2b.pro +++ b/src/plugins/Effect/bs2b/bs2b.pro @@ -10,12 +10,6 @@ SOURCES += bs2bplugin.cpp \ TARGET =$$PLUGINS_PREFIX/Effect/bs2b -CONFIG += warn_on \ -plugin \ -link_pkgconfig - -TEMPLATE = lib - RESOURCES = translations/translations.qrc FORMS += settingsdialog.ui diff --git a/src/plugins/Effect/crossfade/crossfade.pro b/src/plugins/Effect/crossfade/crossfade.pro index df93c9b73..db0348ad7 100644 --- a/src/plugins/Effect/crossfade/crossfade.pro +++ b/src/plugins/Effect/crossfade/crossfade.pro @@ -10,11 +10,6 @@ SOURCES += crossfadeplugin.cpp \ TARGET =$$PLUGINS_PREFIX/Effect/crossfade -CONFIG += warn_on \ -plugin - -TEMPLATE = lib - RESOURCES = translations/translations.qrc FORMS += settingsdialog.ui @@ -22,12 +17,7 @@ FORMS += settingsdialog.ui unix { target.path = $$LIB_DIR/qmmp/Effect INSTALLS += target - - LIBS += -lqmmp -L/usr/lib -I/usr/include QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libcrossfade.so } -win32 { - LIBS += -lqmmp0 -} diff --git a/src/plugins/Effect/filewriter/filewriter.pro b/src/plugins/Effect/filewriter/filewriter.pro index 2038815fb..937044e5e 100644 --- a/src/plugins/Effect/filewriter/filewriter.pro +++ b/src/plugins/Effect/filewriter/filewriter.pro @@ -10,10 +10,6 @@ SOURCES += effectfilewriterfactory.cpp \ TARGET =$$PLUGINS_PREFIX/Effect/filewriter -CONFIG += warn_on plugin link_pkgconfig - -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro index 383c76de1..2b8f94d84 100644 --- a/src/plugins/Effect/ladspa/ladspa.pro +++ b/src/plugins/Effect/ladspa/ladspa.pro @@ -12,15 +12,11 @@ SOURCES += ladspahost.cpp \ ladspaslider.cpp \ ladspahelper.cpp \ ladspabutton.cpp + TARGET = $$PLUGINS_PREFIX/Effect/ladspa QMAKE_CLEAN = $$PLUGINS_PREFIX/Effect/libladspa.so -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib -LIBS += -lqmmp \ - -L/usr/lib \ - -I/usr/include + +LIBS += -L/usr/lib -I/usr/include linux-g++|linux-g++-32|linux-g++-64:LIBS += -ldl diff --git a/src/plugins/Effect/soxr/soxr.pro b/src/plugins/Effect/soxr/soxr.pro index 49e03b78f..a5cf61f80 100644 --- a/src/plugins/Effect/soxr/soxr.pro +++ b/src/plugins/Effect/soxr/soxr.pro @@ -10,23 +10,18 @@ SOURCES += soxresampler.cpp \ TARGET=$$PLUGINS_PREFIX/Effect/soxr QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libsoxr.so -CONFIG += warn_on \ -plugin - -TEMPLATE = lib RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Effect INSTALLS += target - CONFIG += link_pkgconfig PKGCONFIG += soxr - LIBS += -lqmmp -L/usr/lib -I/usr/include + LIBS += -L/usr/lib -I/usr/include } win32 { - LIBS += -lqmmp0 -lsoxr + LIBS += -lsoxr } FORMS += settingsdialog.ui diff --git a/src/plugins/Effect/stereo/stereo.pro b/src/plugins/Effect/stereo/stereo.pro index 4e605e39e..ee783eaa8 100644 --- a/src/plugins/Effect/stereo/stereo.pro +++ b/src/plugins/Effect/stereo/stereo.pro @@ -10,11 +10,6 @@ SOURCES += stereoplugin.cpp \ TARGET =$$PLUGINS_PREFIX/Effect/stereo -CONFIG += warn_on \ -plugin - -TEMPLATE = lib - RESOURCES = translations/translations.qrc FORMS += settingsdialog.ui @@ -23,10 +18,6 @@ unix { target.path = $$LIB_DIR/qmmp/Effect INSTALLS += target - LIBS += -lqmmp -L/usr/lib -I/usr/include - QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libstereo.so -} -win32 { - LIBS += -lqmmp0 + QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libstereo.so } diff --git a/src/plugins/Engines/mplayer/mplayer.pro b/src/plugins/Engines/mplayer/mplayer.pro index a51de2a0b..cc3ee8065 100644 --- a/src/plugins/Engines/mplayer/mplayer.pro +++ b/src/plugins/Engines/mplayer/mplayer.pro @@ -9,11 +9,6 @@ SOURCES += mplayerengine.cpp \ mplayermetadatamodel.cpp TARGET = $$PLUGINS_PREFIX/Engines/mplayer QMAKE_CLEAN = $$PLUGINS_PREFIX/Engines/libmplayer.so -CONFIG += warn_on \ - plugin -TEMPLATE = lib -LIBS += -lqmmp \ - -L/usr/lib RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/Engines diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro index a17e19c10..8e83dc49b 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro +++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro @@ -9,23 +9,16 @@ HEADERS += qmmpfiledialog.h \ SOURCES += qmmpfiledialog.cpp \ qmmpfiledialogimpl.cpp - FORMS += qmmpfiledialog.ui -CONFIG += warn_on plugin - -TEMPLATE = lib - RESOURCES += translations/translations.qrc +LIBS += -lqmmpui + unix { target.path = $$LIB_DIR/qmmp/FileDialogs INSTALLS += target QMAKE_CLEAN =$$PLUGINS_PREFIX/FileDialogs/libqmmpfiledialog.so - LIBS += -lqmmpui -lqmmp -} -win32 { - LIBS += -lqmmpui0 -lqmmp0 } diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro index c341e3fff..a7ecc3624 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro @@ -12,9 +12,7 @@ SOURCES += twopanelfiledialog.cpp \ FORMS += twopanelfiledialog.ui -CONFIG += warn_on plugin - -TEMPLATE = lib +LIBS += -lqmmpui RESOURCES += translations/translations.qrc @@ -23,9 +21,5 @@ unix { INSTALLS += target QMAKE_CLEAN =$$PLUGINS_PREFIX/FileDialogs/libtwopanelfiledialog.so - LIBS += -lqmmpui -lqmmp -} -win32 { - LIBS += -lqmmpui0 -lqmmp0 } diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro index 938601bb7..de458d4eb 100644 --- a/src/plugins/General/converter/converter.pro +++ b/src/plugins/General/converter/converter.pro @@ -1,20 +1,13 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ -link_pkgconfig TARGET =$$PLUGINS_PREFIX/General/converter unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libconverter.so - -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui PKGCONFIG += taglib -win32:LIBS += -lqmmpui0 -lqmmp0 - RESOURCES = translations/translations.qrc presets.qrc unix{ @@ -26,7 +19,7 @@ HEADERS += converterfactory.h \ converterdialog.h \ converter.h \ preseteditor.h -win32:HEADERS += ../../../../src/qmmpui/general.h + SOURCES += converterfactory.cpp \ converterhelper.cpp \ converterdialog.cpp \ diff --git a/src/plugins/General/copypaste/copypaste.pro b/src/plugins/General/copypaste/copypaste.pro index 6610a4f2f..dba9e5b39 100644 --- a/src/plugins/General/copypaste/copypaste.pro +++ b/src/plugins/General/copypaste/copypaste.pro @@ -1,16 +1,9 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin - TARGET =$$PLUGINS_PREFIX/General/copypaste unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcopypaste.so - -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp - -win32:LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui RESOURCES = translations/translations.qrc unix { @@ -20,7 +13,6 @@ unix { HEADERS += copypastefactory.h \ copypaste.h -win32 : HEADERS += ../../../../src/qmmpui/general.h SOURCES += copypastefactory.cpp \ copypaste.cpp diff --git a/src/plugins/General/covermanager/covermanager.pro b/src/plugins/General/covermanager/covermanager.pro index 311798b3b..c74960bfd 100644 --- a/src/plugins/General/covermanager/covermanager.pro +++ b/src/plugins/General/covermanager/covermanager.pro @@ -1,24 +1,8 @@ include(../../plugins.pri) -CONFIG += warn_on \ - plugin -TEMPLATE = lib + TARGET = $$PLUGINS_PREFIX/General/covermanager unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcovermanager.so -TRANSLATIONS = translations/covermanager_plugin_cs.ts \ - translations/covermanager_plugin_de.ts \ - translations/covermanager_plugin_zh_CN.ts \ - translations/covermanager_plugin_zh_TW.ts \ - translations/covermanager_plugin_ru.ts \ - translations/covermanager_plugin_pl.ts \ - translations/covermanager_plugin_uk_UA.ts \ - translations/covermanager_plugin_it.ts \ - translations/covermanager_plugin_tr.ts \ - translations/covermanager_plugin_lt.ts \ - translations/covermanager_plugin_nl.ts \ - translations/covermanager_plugin_ja.ts \ - translations/covermanager_plugin_es.ts \ - translations/covermanager_plugin_sr_BA.ts \ - translations/covermanager_plugin_sr_RS.ts + RESOURCES = translations/translations.qrc \ images/cm_images.qrc @@ -29,13 +13,10 @@ unix { HEADERS += covermanagerfactory.h \ coverwidget.h \ covermanager.h -win32:HEADERS += ../../../../src/qmmpui/general.h + SOURCES += covermanagerfactory.cpp \ coverwidget.cpp \ covermanager.cpp -QT += network -unix:LIBS += -lqmmpui \ - -lqmmp -win32:LIBS += -lqmmpui0 \ - -lqmmp0 +QT += network +LIBS += -lqmmpui diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro index e132670f9..79b5cf895 100644 --- a/src/plugins/General/fileops/fileops.pro +++ b/src/plugins/General/fileops/fileops.pro @@ -1,16 +1,9 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin - TARGET =$$PLUGINS_PREFIX/General/fileops unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libfileops.so - -TEMPLATE = lib -unix : LIBS += -lqmmpui -lqmmp - -win32 : LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui RESOURCES = translations/translations.qrc unix { @@ -21,7 +14,7 @@ HEADERS += fileopsfactory.h \ fileops.h \ settingsdialog.h \ hotkeydialog.h -win32 : HEADERS += ../../../../src/qmmpui/general.h + SOURCES += fileopsfactory.cpp \ fileops.cpp \ settingsdialog.cpp \ diff --git a/src/plugins/General/gnomehotkey/gnomehotkey.pro b/src/plugins/General/gnomehotkey/gnomehotkey.pro index 429c92848..0968f35ed 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkey.pro +++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro @@ -1,15 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib \ - qdbus +QT += dbus TARGET = $$PLUGINS_PREFIX/General/gnomehotkey QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libgnomehotkey.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/General @@ -22,4 +17,4 @@ HEADERS += gnomehotkeyfactory.h \ SOURCES += gnomehotkeyfactory.cpp \ mediakeys.cpp -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro index 083042183..22b577958 100644 --- a/src/plugins/General/hal/hal.pro +++ b/src/plugins/General/hal/hal.pro @@ -1,15 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib \ - qdbus +QT += dbus TARGET = $$PLUGINS_PREFIX/General/hal QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/General @@ -28,6 +23,6 @@ SOURCES += halfactory.cpp \ haldevice.cpp \ settingsdialog.cpp -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui FORMS += settingsdialog.ui diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro index 438c981e6..a97191bcd 100644 --- a/src/plugins/General/hotkey/hotkey.pro +++ b/src/plugins/General/hotkey/hotkey.pro @@ -1,16 +1,7 @@ include(../../plugins.pri)
-CONFIG += warn_on \
-plugin \
- lib \
- link_pkgconfig
-
-
TARGET = $$PLUGINS_PREFIX/General/hotkey
-
-TEMPLATE = lib
-
RESOURCES = translations/translations.qrc
target.path = $$LIB_DIR/qmmp/General
@@ -35,9 +26,8 @@ unix { QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhotkey.so
PKGCONFIG += x11
DEFINES += HAVE_XKBLIB_H
- LIBS += -lqmmpui -lqmmp
}
-win32 {
- LIBS += -lqmmpui0 -lqmmp0
-}
+
+LIBS += -lqmmpui
+
diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro index 7de78438b..75b7f11d2 100644 --- a/src/plugins/General/kdenotify/kdenotify.pro +++ b/src/plugins/General/kdenotify/kdenotify.pro @@ -3,15 +3,11 @@ # ------------------------------------------------- include(../../plugins.pri) QT += dbus -CONFIG += warn_on \ - plugin -unix:TARGET = $$PLUGINS_PREFIX/General/kdenotify -unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so -TEMPLATE = lib -unix { - LIBS += -lqmmpui \ - -lqmmp -} + +TARGET = $$PLUGINS_PREFIX/General/kdenotify +QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so +LIBS += -lqmmpui + unix { target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro index 88336bd95..d4007b6de 100644 --- a/src/plugins/General/lyrics/lyrics.pro +++ b/src/plugins/General/lyrics/lyrics.pro @@ -1,16 +1,9 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin - TARGET =$$PLUGINS_PREFIX/General/lyrics unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so - -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp - -win32:LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui RESOURCES = translations/translations.qrc diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro index 934d2fbb5..5a1518440 100644 --- a/src/plugins/General/mpris/mpris.pro +++ b/src/plugins/General/mpris/mpris.pro @@ -1,15 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib \ - qdbus +QT += dbus TARGET =$$PLUGINS_PREFIX/General/mpris QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libmpris.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/General @@ -31,4 +26,4 @@ SOURCES += mprisfactory.cpp \ mpris2/root2object.cpp \ mpris2/player2object.cpp -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro index 5e33b5fd3..5380030f9 100644 --- a/src/plugins/General/notifier/notifier.pro +++ b/src/plugins/General/notifier/notifier.pro @@ -1,21 +1,15 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin TARGET =$$PLUGINS_PREFIX/General/notifier unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so - -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp -win32:LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui RESOURCES = notifier_images.qrc \ translations/translations.qrc unix { - CONFIG += link_pkgconfig PKGCONFIG += x11 target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro index fd8656de2..dc26945b2 100644 --- a/src/plugins/General/rgscan/rgscan.pro +++ b/src/plugins/General/rgscan/rgscan.pro @@ -1,23 +1,15 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ -link_pkgconfig - TARGET =$$PLUGINS_PREFIX/General/rgscan unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/librgscan.so - -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp - -win32:LIBS += -lqmmpui0 -lqmmp0 -ltag.dll +LIBS += -lqmmpui RESOURCES = translations/translations.qrc unix{ -PKGCONFIG += taglib -target.path = $$LIB_DIR/qmmp/General -INSTALLS += target + PKGCONFIG += taglib + target.path = $$LIB_DIR/qmmp/General + INSTALLS += target } HEADERS += rgscanfactory.h \ rgscanhelper.h \ @@ -25,7 +17,6 @@ HEADERS += rgscanfactory.h \ gain_analysis.h \ rgscanner.h -win32:HEADERS += ../../../../src/qmmpui/general.h SOURCES += rgscanfactory.cpp \ rgscanhelper.cpp \ rgscandialog.cpp \ diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro index 16931c7a1..bab0e0a82 100644 --- a/src/plugins/General/scrobbler/scrobbler.pro +++ b/src/plugins/General/scrobbler/scrobbler.pro @@ -1,7 +1,5 @@ include(../../plugins.pri) -CONFIG += warn_on \ - plugin -TEMPLATE = lib + TARGET = $$PLUGINS_PREFIX/General/scrobbler unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libscrobbler.so @@ -16,19 +14,20 @@ HEADERS += scrobblerfactory.h \ scrobblercache.h \ scrobbler.h \ defines.h -win32:HEADERS += ../../../../src/qmmpui/general.h + SOURCES += scrobblerfactory.cpp \ settingsdialog.cpp \ scrobblerhandler.cpp \ scrobblercache.cpp \ scrobbler.cpp -QT += network -unix:LIBS += -lqmmpui \ - -lqmmp -win32:LIBS += -lqmmpui0 \ - -lqmmp0 + FORMS += settingsdialog.ui +QT += network + +LIBS += -lqmmpui + + diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro index 4228d60f6..49e9c8d83 100644 --- a/src/plugins/General/statusicon/statusicon.pro +++ b/src/plugins/General/statusicon/statusicon.pro @@ -1,18 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ - plugin + unix:TARGET = $$PLUGINS_PREFIX/General/statusicon unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstatusicon.so win32:TARGET = $$PLUGINS_PREFIX/General/statusicon -TEMPLATE = lib -unix { - LIBS += -lqmmpui \ - -lqmmp -} -win32 { - LIBS += -lqmmpui0 \ - -lqmmp0 -} + +LIBS += -lqmmpui RESOURCES = translations/translations.qrc unix { @@ -32,5 +24,6 @@ SOURCES += statusiconfactory.cpp \ qmmptrayicon.cpp \ statusiconpopupwidget.cpp \ coverwidget.cpp + FORMS += settingsdialog.ui -win32:HEADERS += ../../../../src/qmmpui/general.h + diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro index 1bf1235de..049db03a8 100644 --- a/src/plugins/General/streambrowser/streambrowser.pro +++ b/src/plugins/General/streambrowser/streambrowser.pro @@ -1,22 +1,15 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin - TARGET =$$PLUGINS_PREFIX/General/streambrowser unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstreambrowser.so - -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp - -win32:LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui RESOURCES = translations/translations.qrc unix { -target.path = $$LIB_DIR/qmmp/General -INSTALLS += target + target.path = $$LIB_DIR/qmmp/General + INSTALLS += target } HEADERS += streambrowserfactory.h \ streambrowser.h \ diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro index f5b0264e1..cc76d713b 100644 --- a/src/plugins/General/trackchange/trackchange.pro +++ b/src/plugins/General/trackchange/trackchange.pro @@ -1,16 +1,9 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin - TARGET =$$PLUGINS_PREFIX/General/trackchange unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so - -TEMPLATE = lib -unix : LIBS += -lqmmpui -lqmmp - -win32 : LIBS += -lqmmpui0 -lqmmp0 +LIBS += -lqmmpui RESOURCES = translations/translations.qrc unix { @@ -21,7 +14,6 @@ HEADERS += trackchangefactory.h \ trackchange.h \ settingsdialog.h -win32 : HEADERS += ../../../../src/qmmpui/general.h SOURCES += trackchangefactory.cpp \ trackchange.cpp \ settingsdialog.cpp diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro index b3f1c8d41..388926ff0 100644 --- a/src/plugins/General/udisks/udisks.pro +++ b/src/plugins/General/udisks/udisks.pro @@ -1,15 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib \ - qdbus +QT += dbus TARGET = $$PLUGINS_PREFIX/General/udisks QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/General @@ -28,6 +23,6 @@ SOURCES += udisksfactory.cpp \ udisksdevice.cpp \ settingsdialog.cpp -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui FORMS += settingsdialog.ui diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro index 484229668..193af114f 100644 --- a/src/plugins/General/udisks2/udisks2.pro +++ b/src/plugins/General/udisks2/udisks2.pro @@ -1,15 +1,10 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib \ - qdbus +QT += dbus TARGET = $$PLUGINS_PREFIX/General/udisks2 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks2.so -TEMPLATE = lib - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/General @@ -28,6 +23,6 @@ SOURCES += udisks2factory.cpp \ udisks2device.cpp \ settingsdialog.cpp -LIBS += -lqmmpui -lqmmp +LIBS += -lqmmpui FORMS += settingsdialog.ui diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro index 25be00d73..48c3592bb 100644 --- a/src/plugins/Input/aac/aac.pro +++ b/src/plugins/Input/aac/aac.pro @@ -10,12 +10,7 @@ SOURCES += decoder_aac.cpp \ aacmetadatamodel.cpp TARGET = $$PLUGINS_PREFIX/Input/aac QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libaac.so -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib -LIBS += -lqmmp \ - -lfaad \ +LIBS += -lfaad \ -L/usr/lib \ -I/usr/include PKGCONFIG += taglib diff --git a/src/plugins/Input/archive/archive.pro b/src/plugins/Input/archive/archive.pro index d10d22e8c..5de6744fc 100644 --- a/src/plugins/Input/archive/archive.pro +++ b/src/plugins/Input/archive/archive.pro @@ -16,22 +16,14 @@ SOURCES += \ TARGET=$$PLUGINS_PREFIX/Input/archive -CONFIG += warn_on \ -plugin \ -link_pkgconfig - -TEMPLATE = lib +LIBS += -lqmmp RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - LIBS += -lqmmp + PKGCONFIG += libarchive taglib QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libarc.so } - -win32 { - LIBS += -lqmmp0 -larchive -ltag -} diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro index dbd9cfcac..d8e123a4c 100644 --- a/src/plugins/Input/cdaudio/cdaudio.pro +++ b/src/plugins/Input/cdaudio/cdaudio.pro @@ -7,20 +7,16 @@ SOURCES += decoder_cdaudio.cpp \ decodercdaudiofactory.cpp \ settingsdialog.cpp -CONFIG += warn_on \ -plugin \ -link_pkgconfig -TEMPLATE = lib - TARGET =$$PLUGINS_PREFIX/Input/cdaudio RESOURCES = translations/translations.qrc - FORMS += settingsdialog.ui +LIBS += -lqmmp + unix { - LIBS += -lqmmp -L/usr/lib -I/usr/include + LIBS += -L/usr/lib -I/usr/include PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia libcddb target.path = $$LIB_DIR/qmmp/Input QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libcdaudio.so @@ -28,7 +24,5 @@ unix { } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lcdio -lcdio_paranoia -lcdio_cdda -lm -lwinmm -mwindows -liconv -lcddb -lws2_32 + LIBS += -lcdio -lcdio_paranoia -lcdio_cdda -lm -lwinmm -mwindows -liconv -lcddb -lws2_32 } diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro index 141f4576c..21c0c366f 100644 --- a/src/plugins/Input/cue/cue.pro +++ b/src/plugins/Input/cue/cue.pro @@ -10,27 +10,14 @@ SOURCES += decoder_cue.cpp \ cueparser.cpp \ settingsdialog.cpp \ cuemetadatamodel.cpp -win32:HEADERS += ../../../../src/qmmp/decoder.h \ - ../../../../src/qmmp/statehandler.h + TARGET = $$PLUGINS_PREFIX/Input/cue unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libcue.so -CONFIG += warn_on \ - plugin -TEMPLATE = lib -unix{ - LIBS += -lqmmp -L/usr/lib -} - -win32{ - LIBS += -lqmmp0 -} contains(CONFIG, WITH_ENCA){ - CONFIG += link_pkgconfig DEFINES += WITH_ENCA unix:PKGCONFIG += enca win32:LIBS += -lenca.dll - } RESOURCES = translations/translations.qrc diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index fa779ece7..a6a5b8801 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -11,18 +11,12 @@ SOURCES += decoder_ffmpeg.cpp \ ffmpegmetadatamodel.cpp \ replaygainreader.cpp -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - TARGET = $$PLUGINS_PREFIX/Input/ffmpeg unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so - LIBS += -lqmmp PKGCONFIG += libavcodec libavformat libavutil } @@ -30,7 +24,7 @@ unix { win32 { HEADERS += ../../../../src/qmmp/metadatamodel.h \ ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll + LIBS += -lavcodec.dll -lavformat.dll -lavutil.dll } DEFINES += __STDC_CONSTANT_MACROS diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro index ff4e0ff31..bfcc5bf8e 100644 --- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro +++ b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro @@ -10,26 +10,18 @@ SOURCES += decoder_ffmpeg.cpp \ ffmpegmetadatamodel.cpp -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - TARGET = $$PLUGINS_PREFIX/Input/ffmpeg_legacy unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg_legacy.so - LIBS += -lqmmp PKGCONFIG += libavcodec libavformat libavutil } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll + LIBS +=-lavcodec.dll -lavformat.dll -lavutil.dll } DEFINES += __STDC_CONSTANT_MACROS diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro index 9f2119db6..8c9ae70cc 100644 --- a/src/plugins/Input/flac/flac.pro +++ b/src/plugins/Input/flac/flac.pro @@ -12,23 +12,18 @@ SOURCES += decoder_flac.cpp \ replaygainreader.cpp TARGET = $$PLUGINS_PREFIX/Input/flac -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - RESOURCES = translations/translations.qrc +LIBS += -lqmmp + unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target PKGCONFIG += taglib flac - LIBS += -lqmmp + QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libflac.so } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lflac -logg -ltag.dll -lm + LIBS += -lflac -logg -ltag.dll -lm } diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro index 5ee416910..73fe7c1fd 100644 --- a/src/plugins/Input/gme/gme.pro +++ b/src/plugins/Input/gme/gme.pro @@ -8,19 +8,20 @@ SOURCES += decoder_gme.cpp \ decodergmefactory.cpp \ gmehelper.cpp \ settingsdialog.cpp + +FORMS += settingsdialog.ui + TARGET = $$PLUGINS_PREFIX/Input/gme QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libgme.so -CONFIG += warn_on \ - plugin -TEMPLATE = lib RESOURCES = translations/translations.qrc +LIBS += -lqmmp + unix{ target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - LIBS += -lqmmp \ - -L/usr/lib \ + LIBS += -L/usr/lib \ -L/usr/local/lib \ -I/usr/include \ -I/usr/local/include \ @@ -28,10 +29,5 @@ unix{ } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lgme.dll + LIBS += -lgme.dll } - -FORMS += \ - settingsdialog.ui diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro index 4881bf66b..1e225bc91 100644 --- a/src/plugins/Input/mad/mad.pro +++ b/src/plugins/Input/mad/mad.pro @@ -14,23 +14,16 @@ SOURCES += decoder_mad.cpp \ replaygainreader.cpp TARGET = $$PLUGINS_PREFIX/Input/mad -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - LIBS += -lqmmp -lmad + LIBS += -lmad PKGCONFIG += taglib mad QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmad.so } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lmad -ltag.dll + LIBS += -lmad -ltag.dll } diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro index 87674b31d..dacb4643f 100644 --- a/src/plugins/Input/modplug/modplug.pro +++ b/src/plugins/Input/modplug/modplug.pro @@ -14,25 +14,17 @@ TARGET = $$PLUGINS_PREFIX/Input/modplug DEFINES += HAVE_STDINT_H \ HAVE_INTTYPES_H -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - - LIBS += -lqmmp PKGCONFIG += libmodplug QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmodplug.so } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lmodplug + LIBS += -lmodplug DEFINES -= UNICODE } diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro index 3044da310..04f6cb09a 100644 --- a/src/plugins/Input/mpc/mpc.pro +++ b/src/plugins/Input/mpc/mpc.pro @@ -8,18 +8,13 @@ SOURCES += decoder_mpc.cpp \ mpcmetadatamodel.cpp TARGET = $$PLUGINS_PREFIX/Input/mpc -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target PKGCONFIG += taglib - LIBS += -lqmmp -lmpcdec -I/usr/include + LIBS += -lmpcdec -I/usr/include exists(/usr/include/mpcdec/mpcdec.h):DEFINES += MPC_OLD_API QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmpc.so } @@ -27,6 +22,6 @@ unix { win32 { HEADERS += ../../../../src/qmmp/metadatamodel.h \ ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lmpcdec -ltag.dll + LIBS += -lmpcdec -ltag.dll #DEFINES += MPC_OLD_API } diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro index 98d2b7cbd..4d83a393d 100644 --- a/src/plugins/Input/opus/opus.pro +++ b/src/plugins/Input/opus/opus.pro @@ -16,10 +16,6 @@ SOURCES += decoder_opus.cpp \ tdebug.cpp TARGET = $$PLUGINS_PREFIX/Input/opus -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib RESOURCES = translations/translations.qrc @@ -28,12 +24,9 @@ unix { INSTALLS += target PKGCONFIG += taglib opus opusfile - LIBS += -lqmmp QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libopus.so } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lopusfile -lopus -ltag.dll -lm + LIBS += -lopusfile -lopus -ltag.dll -lm } diff --git a/src/plugins/Input/sid/sid.pro b/src/plugins/Input/sid/sid.pro index d4661caa2..290633d80 100644 --- a/src/plugins/Input/sid/sid.pro +++ b/src/plugins/Input/sid/sid.pro @@ -14,22 +14,15 @@ FORMS += \ TARGET = $$PLUGINS_PREFIX/Input/sid QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libsid.so -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib RESOURCES = translations/translations.qrc unix{ target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - LIBS += -lqmmp PKGCONFIG += libsidplayfp } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lsidplayfp.dll + LIBS += -lsidplayfp.dll } diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro index 0033f2fd5..b2b06b90b 100644 --- a/src/plugins/Input/sndfile/sndfile.pro +++ b/src/plugins/Input/sndfile/sndfile.pro @@ -7,25 +7,15 @@ SOURCES += decoder_sndfile.cpp \ TARGET=$$PLUGINS_PREFIX/Input/sndfile -CONFIG += warn_on \ -plugin \ -link_pkgconfig - -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - - LIBS += -lqmmp PKGCONFIG += sndfile QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libsndfile.so } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lsndfile -lflac -lvorbisenc -lvorbis -logg + LIBS += -lsndfile -lflac -lvorbisenc -lvorbis -logg } diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro index bb6357522..e0c47ff38 100644 --- a/src/plugins/Input/vorbis/vorbis.pro +++ b/src/plugins/Input/vorbis/vorbis.pro @@ -10,11 +10,6 @@ SOURCES += decoder_vorbis.cpp \ replaygainreader.cpp TARGET = $$PLUGINS_PREFIX/Input/vorbis -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { @@ -22,13 +17,10 @@ unix { INSTALLS += target PKGCONFIG += taglib ogg vorbisfile vorbis - LIBS += -lqmmp QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libvorbis.so } win32 { - HEADERS += ../../../../src/qmmp/metadatamodel.h \ - ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lvorbisfile -lvorbis -logg -ltag.dll -lm + LIBS += -lvorbisfile -lvorbis -logg -ltag.dll -lm LD_FLAGS += -no-undefined } diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro index 1439c2b71..1490a9c8c 100644 --- a/src/plugins/Input/wavpack/wavpack.pro +++ b/src/plugins/Input/wavpack/wavpack.pro @@ -12,18 +12,11 @@ SOURCES += decoder_wavpack.cpp \ replaygainreader.cpp TARGET = $$PLUGINS_PREFIX/Input/wavpack -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Input INSTALLS += target - - LIBS += -lqmmp PKGCONFIG += wavpack QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwavpack.so } @@ -31,5 +24,5 @@ unix { win32 { HEADERS += ../../../../src/qmmp/metadatamodel.h \ ../../../../src/qmmp/decoderfactory.h - LIBS += -lqmmp0 -lwavpack + LIBS += -lwavpack } diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro index 2c1dc2f5a..fb0b78828 100644 --- a/src/plugins/Input/wildmidi/wildmidi.pro +++ b/src/plugins/Input/wildmidi/wildmidi.pro @@ -10,11 +10,8 @@ SOURCES += decoder_wildmidi.cpp \ settingsdialog.cpp TARGET = $$PLUGINS_PREFIX/Input/wildmidi QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwildmidi.so -CONFIG += warn_on \ - plugin -TEMPLATE = lib -LIBS += -lqmmp \ - -L/usr/lib \ + +LIBS += -L/usr/lib \ -I/usr/include \ -lWildMidi diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro index e72daa88c..c3a1812dd 100644 --- a/src/plugins/Output/alsa/alsa.pro +++ b/src/plugins/Output/alsa/alsa.pro @@ -10,13 +10,6 @@ SOURCES += outputalsa.cpp \ TARGET=$$PLUGINS_PREFIX/Output/alsa QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libalsa.so -CONFIG += warn_on \ -thread \ -plugin \ -link_pkgconfig - -TEMPLATE = lib -LIBS += -lqmmp PKGCONFIG += alsa FORMS += settingsdialog.ui diff --git a/src/plugins/Output/directsound/directsound.pro b/src/plugins/Output/directsound/directsound.pro index 7978c5d12..68febb16a 100644 --- a/src/plugins/Output/directsound/directsound.pro +++ b/src/plugins/Output/directsound/directsound.pro @@ -8,15 +8,9 @@ SOURCES += outputdirectsoundfactory.cpp \ HEADERS += ../../../../src/qmmp/output.h - TARGET=$$PLUGINS_PREFIX/Output/directsound -CONFIG += warn_on \ -thread \ -plugin - -TEMPLATE = lib -LIBS += -lqmmp0 -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound -lksuser +LIBS += -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound -lksuser RESOURCES = translations/translations.qrc diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro index a05818341..f6648c391 100644 --- a/src/plugins/Output/jack/jack.pro +++ b/src/plugins/Output/jack/jack.pro @@ -15,12 +15,6 @@ contains(CONFIG, WITH_NEW_JACK){ DEFINES += JACK_NEW_API } -CONFIG += warn_on \ -thread \ -plugin \ -link_pkgconfig -TEMPLATE = lib -LIBS += -lqmmp PKGCONFIG += jack soxr RESOURCES = translations/translations.qrc diff --git a/src/plugins/Output/null/null.pro b/src/plugins/Output/null/null.pro index d0ee70a59..3c4141f4d 100644 --- a/src/plugins/Output/null/null.pro +++ b/src/plugins/Output/null/null.pro @@ -9,21 +9,10 @@ SOURCES += outputnullfactory.cpp \ TARGET=$$PLUGINS_PREFIX/Output/null -CONFIG += warn_on \ -thread \ -plugin - -TEMPLATE = lib - RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Output INSTALLS += target - LIBS += -lqmmp QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libnull.so } - -win32 { - LIBS += -lqmmp0 -} diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro index 050970aea..12ab8d226 100644 --- a/src/plugins/Output/oss/oss.pro +++ b/src/plugins/Output/oss/oss.pro @@ -12,15 +12,8 @@ SOURCES += outputossfactory.cpp \ TARGET=$$PLUGINS_PREFIX/Output/oss QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss.so -CONFIG += warn_on \ -thread \ -plugin - DEFINES += HAVE_SYS_SOUNDCARD_H -TEMPLATE = lib -LIBS += -lqmmp - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/Output diff --git a/src/plugins/Output/oss4/oss4.pro b/src/plugins/Output/oss4/oss4.pro index c26a8ffaf..81a83b48c 100644 --- a/src/plugins/Output/oss4/oss4.pro +++ b/src/plugins/Output/oss4/oss4.pro @@ -13,16 +13,8 @@ SOURCES += outputoss4factory.cpp \ TARGET=$$PLUGINS_PREFIX/Output/oss4 QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss4.so - -CONFIG += warn_on \ -thread \ -plugin - DEFINES += HAVE_SYS_SOUNDCARD_H -TEMPLATE = lib -LIBS += -lqmmp - RESOURCES = translations/translations.qrc target.path = $$LIB_DIR/qmmp/Output diff --git a/src/plugins/Output/pulseaudio/pulseaudio.pro b/src/plugins/Output/pulseaudio/pulseaudio.pro index 8f02159ac..c60e4d1a9 100644 --- a/src/plugins/Output/pulseaudio/pulseaudio.pro +++ b/src/plugins/Output/pulseaudio/pulseaudio.pro @@ -10,14 +10,6 @@ SOURCES += outputpulseaudiofactory.cpp \ TARGET=$$PLUGINS_PREFIX/Output/pulseaudio QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libpulseaudio.so -CONFIG += warn_on \ -thread \ -plugin \ -link_pkgconfig - -TEMPLATE = lib -LIBS += -lqmmp - PKGCONFIG += libpulse-simple RESOURCES = translations/translations.qrc diff --git a/src/plugins/Output/qtmultimedia/qtmultimedia.pro b/src/plugins/Output/qtmultimedia/qtmultimedia.pro index f4adeef2f..40ab13f33 100644 --- a/src/plugins/Output/qtmultimedia/qtmultimedia.pro +++ b/src/plugins/Output/qtmultimedia/qtmultimedia.pro @@ -14,21 +14,11 @@ SOURCES += outputqtmultimediafactory.cpp \ TARGET=$$PLUGINS_PREFIX/Output/qtmultimedia -CONFIG += warn_on \ -thread \ -plugin - -TEMPLATE = lib RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Output INSTALLS += target - LIBS += -lqmmp QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libqtmultimedia.so } - -win32 { - LIBS += -lqmmp0 -} diff --git a/src/plugins/Output/shout/shout.pro b/src/plugins/Output/shout/shout.pro index 04bef93e4..fc7706366 100644 --- a/src/plugins/Output/shout/shout.pro +++ b/src/plugins/Output/shout/shout.pro @@ -12,26 +12,15 @@ SOURCES += outputshoutfactory.cpp \ TARGET=$$PLUGINS_PREFIX/Output/shout -CONFIG += warn_on \ -thread \ -plugin \ -link_pkgconfig - -TEMPLATE = lib RESOURCES = translations/translations.qrc unix { target.path = $$LIB_DIR/qmmp/Output INSTALLS += target - LIBS += -lqmmp QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libshout.so PKGCONFIG += ogg vorbis vorbisenc shout soxr } -win32 { - LIBS += -lqmmp0 -} - FORMS += \ settingsdialog.ui diff --git a/src/plugins/Output/wasapi/wasapi.pro b/src/plugins/Output/wasapi/wasapi.pro index 0fc92073c..b1f681f36 100644 --- a/src/plugins/Output/wasapi/wasapi.pro +++ b/src/plugins/Output/wasapi/wasapi.pro @@ -8,15 +8,9 @@ SOURCES += outputwasapifactory.cpp \ HEADERS += ../../../../src/qmmp/output.h - TARGET=$$PLUGINS_PREFIX/Output/wasapi -CONFIG += warn_on \ -thread \ -plugin - -TEMPLATE = lib -LIBS += -lqmmp0 -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser +LIBS += -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser RESOURCES = translations/translations.qrc diff --git a/src/plugins/Output/waveout/waveout.pro b/src/plugins/Output/waveout/waveout.pro index 94a6d264c..e15b28249 100644 --- a/src/plugins/Output/waveout/waveout.pro +++ b/src/plugins/Output/waveout/waveout.pro @@ -6,17 +6,9 @@ HEADERS += outputwaveoutfactory.h \ SOURCES += outputwaveoutfactory.cpp \ outputwaveout.cpp -HEADERS += ../../../../src/qmmp/output.h - - TARGET=$$PLUGINS_PREFIX/Output/waveout -CONFIG += warn_on \ -thread \ -plugin - -TEMPLATE = lib -LIBS += -lqmmp0 -lwinmm +LIBS += -lwinmm RESOURCES = translations/translations.qrc diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro index b07ed85b6..7761d284d 100644 --- a/src/plugins/PlayListFormats/m3u/m3u.pro +++ b/src/plugins/PlayListFormats/m3u/m3u.pro @@ -1,25 +1,15 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET =$$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat -TEMPLATE = lib - HEADERS += m3uplaylistformat.h SOURCES += m3uplaylistformat.cpp +LIBS += -lqmmpui + unix { target.path = $$LIB_DIR/qmmp/PlayListFormats INSTALLS += target - QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libm3uplaylistformat.so - LIBS += -lqmmpui -} - -win32 { - LIBS += -lqmmpui0 } diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro index 1e6809acc..22bf9beae 100644 --- a/src/plugins/PlayListFormats/pls/pls.pro +++ b/src/plugins/PlayListFormats/pls/pls.pro @@ -1,26 +1,15 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat -TEMPLATE = lib - SOURCES += plsplaylistformat.cpp HEADERS += plsplaylistformat.h +LIBS += -lqmmpui + unix { target.path = $$LIB_DIR/qmmp/PlayListFormats INSTALLS += target - QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat.so - LIBS += -lqmmpui } - -win32 { - LIBS += -lqmmpui0 -} - diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro index 28ba5b736..42d1da5a6 100644 --- a/src/plugins/PlayListFormats/xspf/xspf.pro +++ b/src/plugins/PlayListFormats/xspf/xspf.pro @@ -1,25 +1,16 @@ include(../../plugins.pri) -CONFIG += warn_on \ -plugin \ - lib - TARGET =$$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat -TEMPLATE = lib - SOURCES += xspfplaylistformat.cpp HEADERS += xspfplaylistformat.h +LIBS += -lqmmpui + unix { target.path = $$LIB_DIR/qmmp/PlayListFormats INSTALLS += target QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libxsplaylistformat.so - LIBS += -lqmmpui -lqmmp -} -win32 { - LIBS += -lqmmpui0 -lqmmp0 } - diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro index 38495d18c..75404ae80 100644 --- a/src/plugins/Transports/http/http.pro +++ b/src/plugins/Transports/http/http.pro @@ -9,28 +9,21 @@ SOURCES += \ httpinputsource.cpp \ settingsdialog.cpp \ httpstreamreader.cpp -win32:HEADERS += ../../../../src/qmmp/inputsource.h \ - ../../../../src/qmmp/inputsourcefactory.h + TARGET = $$PLUGINS_PREFIX/Transports/http unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libhttp.so -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib + unix { - LIBS += -lqmmp \ - -L/usr/lib + LIBS += -L/usr/lib PKGCONFIG += libcurl target.path = $$LIB_DIR/qmmp/Transports INSTALLS += target } win32 { - LIBS += -lqmmp0 \ - -lcurldll + LIBS += -lcurldll } contains(CONFIG, WITH_ENCA){ - CONFIG += link_pkgconfig DEFINES += WITH_ENCA unix:PKGCONFIG += enca win32:LIBS += -lenca.dll diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro index ab130f465..43cd1121c 100644 --- a/src/plugins/Transports/mms/mms.pro +++ b/src/plugins/Transports/mms/mms.pro @@ -9,14 +9,9 @@ SOURCES += \ mmsinputsource.cpp \ settingsdialog.cpp \ mmsstreamreader.cpp -win32:HEADERS += ../../../../src/qmmp/inputsource.h \ - ../../../../src/qmmp/inputsourcefactory.h + TARGET = $$PLUGINS_PREFIX/Transports/mms unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmms.so -CONFIG += warn_on \ - plugin \ - link_pkgconfig -TEMPLATE = lib LIBS += -lqmmp -L/usr/lib PKGCONFIG += libmms diff --git a/src/plugins/Ui/qsui/qsui.pro b/src/plugins/Ui/qsui/qsui.pro index 158c5edf3..e3b494979 100644 --- a/src/plugins/Ui/qsui/qsui.pro +++ b/src/plugins/Ui/qsui/qsui.pro @@ -2,11 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/Ui/qsui -CONFIG += warn_on \ - plugin - -TEMPLATE = lib - SOURCES += \ mainwindow.cpp \ listwidget.cpp \ @@ -82,20 +77,13 @@ FORMS += forms/mainwindow.ui \ RESOURCES += translations/translations.qrc resources/qsui_resources.qrc txt/qsui_txt.qrc -TEMPLATE = lib - -CONFIG += warn_on \ - plugin - -TARGET = $$PLUGINS_PREFIX/Ui/qsui +LIBS += -lqmmpui unix{ - LIBS += -lqmmpui -lqmmp target.path = $$LIB_DIR/qmmp/Ui INSTALLS += target } win32{ - LIBS += -lqmmpui0 -lqmmp0 - INCLUDEPATH += ./ + INCLUDEPATH += ./ } diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro index cae04e4b3..dc03fa8f6 100644 --- a/src/plugins/Ui/skinned/skinned.pro +++ b/src/plugins/Ui/skinned/skinned.pro @@ -110,26 +110,16 @@ SOURCES += mainwindow.cpp \ playlistheader.cpp \ horizontalslider.cpp -TEMPLATE = lib -unix:LIBS += -lqmmpui -lqmmp - -win32:LIBS += -lqmmpui0 -lqmmp0 - -CONFIG += warn_on \ - plugin +LIBS += -lqmmpui TARGET = $$PLUGINS_PREFIX/Ui/skinned -unix:LIBS += -lqmmp -lqmmpui -win32:LIBS += -lqmmp0 -lqmmpui0 - RESOURCES = resources/resources.qrc glare/glare.qrc unix { -target.path = $$LIB_DIR/qmmp/Ui -INSTALLS += target -CONFIG += link_pkgconfig -PKGCONFIG += x11 + target.path = $$LIB_DIR/qmmp/Ui + INSTALLS += target + PKGCONFIG += x11 } RESOURCES += translations/translations.qrc diff --git a/src/plugins/Visual/analyzer/analyzer.pro b/src/plugins/Visual/analyzer/analyzer.pro index 9ed972a4d..a1b1e0d18 100644 --- a/src/plugins/Visual/analyzer/analyzer.pro +++ b/src/plugins/Visual/analyzer/analyzer.pro @@ -16,13 +16,6 @@ SOURCES += analyzer.cpp \ visualanalyzerfactory.cpp \ colorwidget.cpp \ settingsdialog.cpp -win32:HEADERS += ../../../../src/qmmp/visual.h -win32:INCLUDEPATH += ./ -CONFIG += warn_on \ -plugin -TEMPLATE = lib -unix:LIBS += -lqmmp -L/usr/lib -I/usr/include -win32:LIBS += -lqmmp0 TRANSLATIONS = translations/analyzer_plugin_cs.ts \ translations/analyzer_plugin_de.ts \ @@ -42,6 +35,6 @@ TRANSLATIONS = translations/analyzer_plugin_cs.ts \ RESOURCES = translations/translations.qrc unix{ -target.path = $$LIB_DIR/qmmp/Visual -INSTALLS += target + target.path = $$LIB_DIR/qmmp/Visual + INSTALLS += target } diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro index b24dabc5b..31755afd7 100644 --- a/src/plugins/Visual/projectm/projectm.pro +++ b/src/plugins/Visual/projectm/projectm.pro @@ -1,7 +1,7 @@ include(../../plugins.pri) contains(CONFIG, WITH_PROJECTM20){ -DEFINES += PROJECTM_20 + DEFINES += PROJECTM_20 } TARGET =$$PLUGINS_PREFIX/Visual/projectm @@ -10,16 +10,12 @@ QMAKE_CLEAN =$$PLUGINS_PREFIX/Visual/libprojectm.so HEADERS += projectmwidget.h \ visualprojectmfactory.h \ projectmplugin.h \ - projectmwrapper.h + projectmwrapper.h SOURCES += projectmplugin.cpp \ visualprojectmfactory.cpp \ projectmwidget.cpp \ - projectmwrapper.cpp -CONFIG += warn_on \ -plugin \ -link_pkgconfig + projectmwrapper.cpp -TEMPLATE = lib QT += opengl TRANSLATIONS = translations/projectm_plugin_cs.ts \ @@ -43,7 +39,7 @@ unix { PKGCONFIG += libprojectM target.path = $$LIB_DIR/qmmp/Visual INSTALLS += target - LIBS += -lqmmp -L/usr/lib -I/usr/include + LIBS += -L/usr/lib -I/usr/include #projectM config path PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \ /usr/local/share/projectM/config.inp @@ -56,5 +52,5 @@ unix { } win32 { - LIBS += -lqmmp0 -lprojectM.dll + LIBS += -lprojectM.dll } diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index 34482fb6b..0d1d3f882 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -13,3 +13,8 @@ unix { } PLUGINS_PREFIX=../../../../lib/qmmp } + +CONFIG += warn_on plugin lib thread link_pkgconfig +TEMPLATE = lib + +LIBS += -lqmmp |