aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-10 14:44:07 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-10 14:44:07 +0000
commitd8c9314229204d87e8f08e33da4e363b61e5c6ea (patch)
treeda08b064329ec72614ddcdd914c936fced75d111
parenta15f2d6df476e302c479e469bfa693317d732eff (diff)
downloadqmmp-d8c9314229204d87e8f08e33da4e363b61e5c6ea.tar.gz
qmmp-d8c9314229204d87e8f08e33da4e363b61e5c6ea.tar.bz2
qmmp-d8c9314229204d87e8f08e33da4e363b61e5c6ea.zip
fixed qmake support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3213 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--qmmp.pri5
-rw-r--r--src/plugins/Input/Input.pro2
2 files changed, 5 insertions, 2 deletions
diff --git a/qmmp.pri b/qmmp.pri
index 55a6b52ad..bf7e14174 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -20,7 +20,7 @@ CONFIG += FFMPEG_PLUGIN
CONFIG += MODPLUG_PLUGIN
CONFIG += WILDMIDI_PLUGIN
CONFIG += GME_PLUGIN
-CONFIG += OSS_PLUGIN
+CONFIG += OSS_PLUGIN #deprecated
CONFIG += PULSE_AUDIO_PLUGIN
CONFIG += ALSA_PLUGIN
#CONFIG += OSS4_PLUGIN
@@ -30,6 +30,9 @@ CONFIG += CDAUDIO_PLUGIN
CONFIG += BS2B_PLUGIN
CONFIG += LADSPA_PLUGIN
CONFIG += PROJECTM_PLUGIN
+CONFIG += UDISKS_PLUGIN #deprecated
+CONFIG += UDISKS2_PLUGIN
+CONFIG += HAL_PLUGIN
#additional features
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index 3490b1d58..d759279fe 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{