aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-07 16:01:06 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-07 16:01:06 +0000
commit0720c0a32a0a6380eab06248ba8cfe543c008676 (patch)
tree67104981a1fa320b5fe119ed00e27c83596897fd
parentdb14948d830fcb3f51ff54f736d0593eef4608aa (diff)
downloadqmmp-0720c0a32a0a6380eab06248ba8cfe543c008676.tar.gz
qmmp-0720c0a32a0a6380eab06248ba8cfe543c008676.tar.bz2
qmmp-0720c0a32a0a6380eab06248ba8cfe543c008676.zip
updated qmake files
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3204 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/General/General.pro18
-rw-r--r--src/plugins/Input/Input.pro2
2 files changed, 16 insertions, 4 deletions
diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index e47b0e2b7..d6d985023 100644
--- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro
@@ -1,3 +1,5 @@
+include(../../../qmmp.pri)
+
SUBDIRS += statusicon \
notifier \
lyrics \
@@ -7,10 +9,20 @@ SUBDIRS += statusicon \
streambrowser \
trackchange
unix:SUBDIRS += mpris \
- hal \
- udisks \
- udisks2 \
hotkey \
kdenotify \
converter
+
+contains(CONFIG, UDISKS_PLUGIN){
+ SUBDIRS += udisks
+}
+
+contains(CONFIG, UDISKS2_PLUGIN){
+ SUBDIRS += udisks2
+}
+
+contains(CONFIG, HAL_PLUGIN){
+ SUBDIRS += hal
+}
+
TEMPLATE = subdirs
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index 9228f90ab..3490b1d58 100644
--- a/src/plugins/Input/Input.pro
+++ b/src/plugins/Input/Input.pro
@@ -16,7 +16,7 @@ contains(CONFIG, MODPLUG_PLUGIN){
}
contains(CONFIG, FFMPEG_PLUGIN){
- SUBDIRS += ffmpeg
+ # SUBDIRS += ffmpeg
}
unix{