fixed win32 build

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7425 90c681e8-e032-0410-971d-27865f9a5e38

27 files changed, 54 insertions, 60 deletions

diff --git a/src/app/app.pro b/src/app/app.pro
index de16fb97a..bbc3fcff9 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -21,9 +21,10 @@ SOURCES += qmmpstarter.cpp \
 RESOURCES = images/images.qrc translations/qmmp_locales.qrc
 
 INCLUDEPATH += ../
-LIBS += -lqmmp -lqmmpui
+
 
 unix {
+    LIBS += -lqmmp -lqmmpui
     QMAKE_LIBDIR += ../../lib
     target.path = /bin
     desktop.files = qmmp.desktop \
@@ -48,6 +49,7 @@ unix {
 }
 
 win32 {
+    LIBS += -lqmmp0 -lqmmpui0
     QMAKE_LIBDIR += ../../bin
     RC_FILE = qmmp.rc
 }
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
index 1e3558c8e..e3d8b6068 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 += -lqmmpui
-
 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 4887aa86e..497536c0f 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 += -lqmmpui
-
 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 128ae4962..d43fe9bfb 100644
--- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
+++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
@@ -2,12 +2,12 @@ include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/CommandLineOptions/seekoption
 
+CONFIG += link_qmmpui
+
 HEADERS += seekoption.h
 
 SOURCES += seekoption.cpp
 
-LIBS += -lqmmpui
-
 RESOURCES = translations/translations.qrc
 
 target.path = $$LIB_DIR/qmmp/CommandLineOptions
diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
index b5cb6188f..8e06423a0 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
 
-RESOURCES = translations/translations.qrc
-
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
-INSTALLS += target
-
-LIBS += -lqmmpui
+CONFIG += link_qmmpui
 
 HEADERS += statusoption.h
 
 SOURCES += statusoption.cpp
+
+RESOURCES = translations/translations.qrc
+
+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 f98c1ee00..becb83238 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
 
-RESOURCES = translations/translations.qrc
-
-LIBS += -lqmmpui
+CONFIG += link_qmmpui
 
 HEADERS += uninstalloption.h
 
 SOURCES += uninstalloption.cpp
+
+RESOURCES = translations/translations.qrc
diff --git a/src/plugins/Effect/filewriter/filewriter.pro b/src/plugins/Effect/filewriter/filewriter.pro
index 1ea616dee..49b8025f9 100644
--- a/src/plugins/Effect/filewriter/filewriter.pro
+++ b/src/plugins/Effect/filewriter/filewriter.pro
@@ -2,6 +2,8 @@ include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/Effect/filewriter
 
+CONFIG += link_qmmpui
+
 HEADERS += effectfilewriterfactory.h \
            filewriterplugin.h \
            settingsdialog.h
@@ -14,8 +16,6 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 57a90e27a..bc43c3d95 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
+++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
@@ -2,6 +2,8 @@ include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/FileDialogs/qmmpfiledialog
 
+CONFIG += link_qmmpui
+
 HEADERS += qmmpfiledialog.h \
            qmmpfiledialogimpl.h
 
@@ -12,8 +14,6 @@ FORMS += qmmpfiledialog.ui
 
 RESOURCES += translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 2fca9bf0c..f68c2edf0 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/hal
 
 QT += dbus
+CONFIG += link_qmmpui
 
 HEADERS += halfactory.h \
            halplugin.h \
@@ -21,7 +22,5 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index 335d9b1ec..b815d906f 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -2,6 +2,8 @@ include(../../plugins.pri)
 

 TARGET = $$PLUGINS_PREFIX/General/hotkey

 

+CONFIG += link_qmmpui

+

 HEADERS += hotkeyfactory.h \

            hotkeymanager.h \

            settingsdialog.h \

@@ -18,8 +20,6 @@ FORMS += settingsdialog.ui \
 

 RESOURCES = translations/translations.qrc

 

-LIBS += -lqmmpui

-

 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 5577e7433..259a166a6 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -6,6 +6,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/kdenotify
 
 QT += dbus
+CONFIG += link_qmmpui
 
 SOURCES += kdenotifyfactory.cpp \
     kdenotify.cpp \
@@ -19,8 +20,6 @@ FORMS += settingsdialog.ui
 
 RESOURCES += translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 41c0aa4f1..68c0bdf1f 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/lyrics
 
 QT += network
+CONFIG += link_qmmpui
 
 HEADERS += lyricsfactory.h \
            lyrics.h \
@@ -16,8 +17,6 @@ FORMS += lyricswindow.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 4fdbcce76..21ec80737 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/mpris
 
 QT += dbus
+CONFIG += link_qmmpui
 
 HEADERS += mprisfactory.h \
            mpris.h  \
@@ -22,7 +23,5 @@ SOURCES += mprisfactory.cpp \
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 6da83f8dc..971d85f7b 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -1,6 +1,7 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/General/notifier
+CONFIG += link_qmmpui
 
 HEADERS += notifierfactory.h \
            notifier.h \
@@ -17,8 +18,6 @@ FORMS += settingsdialog.ui
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 8929efd16..974b922f7 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -1,6 +1,7 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/General/rgscan
+CONFIG += link_qmmpui
 
 HEADERS += rgscanfactory.h \
     rgscanhelper.h \
@@ -18,8 +19,6 @@ FORMS += rgscandialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 5d456e327..c5881d316 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/scrobbler
 
 QT += network
+CONFIG += link_qmmpui
 
 HEADERS += scrobblerfactory.h \
     settingsdialog.h \
@@ -21,8 +22,6 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 0665c61a8..ff6ef6d07 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -1,6 +1,7 @@
 include(../../plugins.pri)
 
-unix:TARGET = $$PLUGINS_PREFIX/General/statusicon
+TARGET = $$PLUGINS_PREFIX/General/statusicon
+CONFIG += link_qmmpui
 
 HEADERS += statusiconfactory.h \
     statusicon.h \
@@ -21,8 +22,6 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc \
             images/tray_images.qrc
 
-LIBS += -lqmmpui
-
 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 aea60f832..4239174c3 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/streambrowser
 
 QT += network
+CONFIG += link_qmmpui
 
 HEADERS += streambrowserfactory.h \
            streambrowser.h \
@@ -16,8 +17,6 @@ FORMS += streamwindow.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 a709b8a1a..681a4cabc 100644
--- a/src/plugins/General/trackchange/trackchange.pro
+++ b/src/plugins/General/trackchange/trackchange.pro
@@ -2,6 +2,8 @@ include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/General/trackchange
 
+CONFIG += link_qmmpui
+
 HEADERS += trackchangefactory.h \
            trackchange.h \
            settingsdialog.h
@@ -14,8 +16,6 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 905a10629..edbe94272 100644
--- a/src/plugins/General/udisks/udisks.pro
+++ b/src/plugins/General/udisks/udisks.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/udisks
 
 QT += dbus
+CONFIG += link_qmmpui
 
 HEADERS += udisksfactory.h \
            udisksplugin.h \
@@ -20,7 +21,5 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 2034bd925..ff30fe707 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -3,6 +3,7 @@ include(../../plugins.pri)
 TARGET = $$PLUGINS_PREFIX/General/udisks2
 
 QT += dbus
+CONFIG += link_qmmpui
 
 HEADERS += udisks2factory.h \
            udisks2plugin.h \
@@ -20,7 +21,5 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmpui
-
 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 f70f38b60..e2d548f0a 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 += -lqmmpui
-
 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 736a20994..aab310826 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 += -lqmmpui
-
 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 c0e45b516..26f3d8de0 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -1,13 +1,12 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat
+CONFIG += link_qmmpui
 
 SOURCES += xspfplaylistformat.cpp
 
 HEADERS += xspfplaylistformat.h
 
-LIBS += -lqmmpui
-
 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 5e2f8dce9..11aae8e30 100644
--- a/src/plugins/Ui/qsui/qsui.pro
+++ b/src/plugins/Ui/qsui/qsui.pro
@@ -1,6 +1,7 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/Ui/qsui
+CONFIG += link_qmmpui
 
 SOURCES += \
     mainwindow.cpp \
@@ -77,8 +78,6 @@ FORMS += forms/mainwindow.ui \
 
 RESOURCES += translations/translations.qrc resources/qsui_resources.qrc txt/qsui_txt.qrc
 
-LIBS += -lqmmpui
-
 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 3d983f34a..e3dac1e2b 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -2,6 +2,8 @@ include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/Ui/skinned
 
+CONFIG += link_qmmpui
+
 HEADERS += mainwindow.h \
     button.h \
     display.h \
@@ -119,8 +121,6 @@ RESOURCES = resources/resources.qrc \
             glare/glare.qrc \
             translations/translations.qrc
 
-LIBS += -lqmmpui
-
 unix {
    target.path = $$LIB_DIR/qmmp/Ui
    INSTALLS += target
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 0d1d3f882..016761421 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -3,8 +3,9 @@ INCLUDEPATH += ../../../qmmp ../../../
 QMAKE_LIBDIR += ../../../../lib
 
 win32 {
-  QMAKE_LIBDIR += ../../../../bin
-  PLUGINS_PREFIX=../../../../../bin/plugins
+    QMAKE_LIBDIR += ../../../../bin
+    PLUGINS_PREFIX=../../../../../bin/plugins
+    LIBS += -lqmmp0
 }
 
 unix {
@@ -12,9 +13,13 @@ unix {
         LIB_DIR = /lib
     }
     PLUGINS_PREFIX=../../../../lib/qmmp
+    LIBS += -lqmmp
 }
 
 CONFIG += warn_on plugin lib thread link_pkgconfig
 TEMPLATE = lib
 
-LIBS += -lqmmp
+contains(CONFIG, link_qmmpui) {
+    unix:LIBS += -lqmmpui
+    win32:LIBS += -lqmmpui0
+}