diff options
Diffstat (limited to 'src/plugins')
26 files changed, 51 insertions, 42 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro index e3d8b6068..035189806 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro @@ -2,13 +2,13 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/CommandLineOptions/incdecvolumeoption -CONFIG += link_qmmpui - HEADERS += incdecvolumeoption.h SOURCES += incdecvolumeoption.cpp RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target diff --git a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro index 497536c0f..a9dd56cbd 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro +++ b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro @@ -2,13 +2,13 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/CommandLineOptions/playlistoption -CONFIG += link_qmmpui - HEADERS += playlistoption.h SOURCES += playlistoption.cpp RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target diff --git a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro index d43fe9bfb..041dea806 100644 --- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro +++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro @@ -2,13 +2,13 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/CommandLineOptions/seekoption -CONFIG += link_qmmpui - HEADERS += seekoption.h SOURCES += seekoption.cpp RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro index 8e06423a0..f6f67e018 100644 --- a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro +++ b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro @@ -2,13 +2,13 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/CommandLineOptions/statusoption -CONFIG += link_qmmpui - HEADERS += statusoption.h SOURCES += statusoption.cpp RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/CommandLineOptions INSTALLS += target diff --git a/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro b/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro index becb83238..579c45b3c 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro +++ b/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro @@ -2,10 +2,10 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/CommandLineOptions/uninstalloption -CONFIG += link_qmmpui - HEADERS += uninstalloption.h SOURCES += uninstalloption.cpp +LIBS += $$QMMPUI_LIB + RESOURCES = translations/translations.qrc diff --git a/src/plugins/Effect/filewriter/filewriter.pro b/src/plugins/Effect/filewriter/filewriter.pro index 49b8025f9..ce1e096a2 100644 --- a/src/plugins/Effect/filewriter/filewriter.pro +++ b/src/plugins/Effect/filewriter/filewriter.pro @@ -2,8 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/Effect/filewriter -CONFIG += link_qmmpui - HEADERS += effectfilewriterfactory.h \ filewriterplugin.h \ settingsdialog.h @@ -16,6 +14,8 @@ FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/Effect INSTALLS += target diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro index bc43c3d95..4e9e5421e 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro +++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro @@ -2,8 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/FileDialogs/qmmpfiledialog -CONFIG += link_qmmpui - HEADERS += qmmpfiledialog.h \ qmmpfiledialogimpl.h @@ -14,6 +12,8 @@ FORMS += qmmpfiledialog.ui RESOURCES += translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/FileDialogs INSTALLS += target diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro index f68c2edf0..3ad52ba04 100644 --- a/src/plugins/General/hal/hal.pro +++ b/src/plugins/General/hal/hal.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/hal QT += dbus -CONFIG += link_qmmpui HEADERS += halfactory.h \ halplugin.h \ @@ -19,6 +18,7 @@ SOURCES += halfactory.cpp \ FORMS += settingsdialog.ui +LIBS += $$QMMPUI_LIB RESOURCES = translations/translations.qrc diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro index b815d906f..7195a5811 100644 --- a/src/plugins/General/hotkey/hotkey.pro +++ b/src/plugins/General/hotkey/hotkey.pro @@ -2,8 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/hotkey
-CONFIG += link_qmmpui
-
HEADERS += hotkeyfactory.h \
hotkeymanager.h \
settingsdialog.h \
@@ -20,6 +18,8 @@ FORMS += settingsdialog.ui \ RESOURCES = translations/translations.qrc
+LIBS += $$QMMPUI_LIB
+
unix {
target.path = $$LIB_DIR/qmmp/General
INSTALLS += target
diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro index 259a166a6..35b3ce238 100644 --- a/src/plugins/General/kdenotify/kdenotify.pro +++ b/src/plugins/General/kdenotify/kdenotify.pro @@ -6,7 +6,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/kdenotify QT += dbus -CONFIG += link_qmmpui SOURCES += kdenotifyfactory.cpp \ kdenotify.cpp \ @@ -20,6 +19,8 @@ FORMS += settingsdialog.ui RESOURCES += translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/General images.files = images/app_icon.png \ images/empty_cover.png diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro index 68c0bdf1f..0bdf0b4e1 100644 --- a/src/plugins/General/lyrics/lyrics.pro +++ b/src/plugins/General/lyrics/lyrics.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/lyrics QT += network -CONFIG += link_qmmpui HEADERS += lyricsfactory.h \ lyrics.h \ @@ -17,6 +16,8 @@ FORMS += lyricswindow.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro index 21ec80737..3a64048aa 100644 --- a/src/plugins/General/mpris/mpris.pro +++ b/src/plugins/General/mpris/mpris.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/mpris QT += dbus -CONFIG += link_qmmpui HEADERS += mprisfactory.h \ mpris.h \ @@ -23,5 +22,7 @@ SOURCES += mprisfactory.cpp \ RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro index 971d85f7b..5a92fce11 100644 --- a/src/plugins/General/notifier/notifier.pro +++ b/src/plugins/General/notifier/notifier.pro @@ -1,7 +1,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/notifier -CONFIG += link_qmmpui HEADERS += notifierfactory.h \ notifier.h \ @@ -18,6 +17,8 @@ FORMS += settingsdialog.ui RESOURCES = notifier_images.qrc \ translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { PKGCONFIG += x11 target.path = $$LIB_DIR/qmmp/General diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro index 974b922f7..8ceefd0bd 100644 --- a/src/plugins/General/rgscan/rgscan.pro +++ b/src/plugins/General/rgscan/rgscan.pro @@ -1,7 +1,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/rgscan -CONFIG += link_qmmpui HEADERS += rgscanfactory.h \ rgscanhelper.h \ @@ -19,6 +18,8 @@ FORMS += rgscandialog.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { PKGCONFIG += taglib target.path = $$LIB_DIR/qmmp/General diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro index c5881d316..9abd9c812 100644 --- a/src/plugins/General/scrobbler/scrobbler.pro +++ b/src/plugins/General/scrobbler/scrobbler.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/scrobbler QT += network -CONFIG += link_qmmpui HEADERS += scrobblerfactory.h \ settingsdialog.h \ @@ -22,6 +21,8 @@ FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro index ff6ef6d07..dd0ca0999 100644 --- a/src/plugins/General/statusicon/statusicon.pro +++ b/src/plugins/General/statusicon/statusicon.pro @@ -1,7 +1,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/statusicon -CONFIG += link_qmmpui HEADERS += statusiconfactory.h \ statusicon.h \ @@ -22,6 +21,8 @@ FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc \ images/tray_images.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro index 4239174c3..75680c8fb 100644 --- a/src/plugins/General/streambrowser/streambrowser.pro +++ b/src/plugins/General/streambrowser/streambrowser.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/streambrowser QT += network -CONFIG += link_qmmpui HEADERS += streambrowserfactory.h \ streambrowser.h \ @@ -17,6 +16,8 @@ FORMS += streamwindow.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro index 681a4cabc..9dba6c5b9 100644 --- a/src/plugins/General/trackchange/trackchange.pro +++ b/src/plugins/General/trackchange/trackchange.pro @@ -2,8 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/trackchange -CONFIG += link_qmmpui - HEADERS += trackchangefactory.h \ trackchange.h \ settingsdialog.h @@ -16,6 +14,8 @@ FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro index edbe94272..e45c95554 100644 --- a/src/plugins/General/udisks/udisks.pro +++ b/src/plugins/General/udisks/udisks.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/udisks QT += dbus -CONFIG += link_qmmpui HEADERS += udisksfactory.h \ udisksplugin.h \ @@ -21,5 +20,7 @@ FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro index ff30fe707..86f08b3b9 100644 --- a/src/plugins/General/udisks2/udisks2.pro +++ b/src/plugins/General/udisks2/udisks2.pro @@ -3,7 +3,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/General/udisks2 QT += dbus -CONFIG += link_qmmpui HEADERS += udisks2factory.h \ udisks2plugin.h \ @@ -21,5 +20,7 @@ FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc +LIBS += $$QMMPUI_LIB + target.path = $$LIB_DIR/qmmp/General INSTALLS += target diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro index e2d548f0a..ae66c0556 100644 --- a/src/plugins/PlayListFormats/m3u/m3u.pro +++ b/src/plugins/PlayListFormats/m3u/m3u.pro @@ -2,12 +2,12 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat -CONFIG += link_qmmpui - HEADERS += m3uplaylistformat.h SOURCES += m3uplaylistformat.cpp +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/PlayListFormats INSTALLS += target diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro index aab310826..6e5b160b0 100644 --- a/src/plugins/PlayListFormats/pls/pls.pro +++ b/src/plugins/PlayListFormats/pls/pls.pro @@ -2,12 +2,12 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat -CONFIG += link_qmmpui - SOURCES += plsplaylistformat.cpp HEADERS += plsplaylistformat.h +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/PlayListFormats INSTALLS += target diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro index 26f3d8de0..5dd274e61 100644 --- a/src/plugins/PlayListFormats/xspf/xspf.pro +++ b/src/plugins/PlayListFormats/xspf/xspf.pro @@ -1,12 +1,13 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat -CONFIG += link_qmmpui SOURCES += xspfplaylistformat.cpp HEADERS += xspfplaylistformat.h +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/PlayListFormats INSTALLS += target diff --git a/src/plugins/Ui/qsui/qsui.pro b/src/plugins/Ui/qsui/qsui.pro index 11aae8e30..dc51cbcc0 100644 --- a/src/plugins/Ui/qsui/qsui.pro +++ b/src/plugins/Ui/qsui/qsui.pro @@ -1,7 +1,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/Ui/qsui -CONFIG += link_qmmpui SOURCES += \ mainwindow.cpp \ @@ -78,6 +77,8 @@ FORMS += forms/mainwindow.ui \ RESOURCES += translations/translations.qrc resources/qsui_resources.qrc txt/qsui_txt.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/Ui INSTALLS += target diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro index e3dac1e2b..77fa36dd0 100644 --- a/src/plugins/Ui/skinned/skinned.pro +++ b/src/plugins/Ui/skinned/skinned.pro @@ -2,8 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/Ui/skinned -CONFIG += link_qmmpui - HEADERS += mainwindow.h \ button.h \ display.h \ @@ -121,6 +119,8 @@ RESOURCES = resources/resources.qrc \ glare/glare.qrc \ translations/translations.qrc +LIBS += $$QMMPUI_LIB + unix { target.path = $$LIB_DIR/qmmp/Ui INSTALLS += target diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index 016761421..68bccfb2c 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -6,6 +6,7 @@ win32 { QMAKE_LIBDIR += ../../../../bin PLUGINS_PREFIX=../../../../../bin/plugins LIBS += -lqmmp0 + QMMPUI_LIB = -lqmmpui0 } unix { @@ -14,12 +15,8 @@ unix { } PLUGINS_PREFIX=../../../../lib/qmmp LIBS += -lqmmp + QMMPUI_LIB = -lqmmpui } CONFIG += warn_on plugin lib thread link_pkgconfig TEMPLATE = lib - -contains(CONFIG, link_qmmpui) { - unix:LIBS += -lqmmpui - win32:LIBS += -lqmmpui0 -} |