summaryrefslogtreecommitdiffstats
path: root/src/plugins/phonon
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2010-10-26 13:40:04 (GMT)
committerLiang Qi <liang.qi@nokia.com>2010-10-26 13:40:04 (GMT)
commitdbf03a71487107999d58972a3e18244e9b8139c8 (patch)
treef6c39c5a638f2fffc79393e2ac392aa4e222af33 /src/plugins/phonon
parent2d071521228a6bc9ef423cbdbbd8560d28208790 (diff)
parentf12bb81ff7dc88861b68fa5f218c1e5d0767257b (diff)
downloadQt-dbf03a71487107999d58972a3e18244e9b8139c8.zip
Qt-dbf03a71487107999d58972a3e18244e9b8139c8.tar.gz
Qt-dbf03a71487107999d58972a3e18244e9b8139c8.tar.bz2
Merge branch 'macMakefileBuildSupport' into master.
Diffstat (limited to 'src/plugins/phonon')
-rw-r--r--src/plugins/phonon/mmf/mmf.pro8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index ac11188..ade9023 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -18,7 +18,7 @@ symbian {
# This is necessary because both epoc32/include and Phonon contain videoplayer.h.
# By making /epoc32/include the first SYSTEMINCLUDE, we ensure that
# '#include <videoplayer.h>' picks up the Symbian header, as intended.
- PREPEND_INCLUDEPATH = /epoc32/include
+ PREPEND_INCLUDEPATH = $$EPOCROOT/epoc32/include
PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty
@@ -125,7 +125,11 @@ symbian {
LIBS += -lmediaclientaudiostream # For CMdaAudioOutputStream
# These are for effects.
- LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
+ is_using_gnupoc {
+ LIBS += -laudioequalizereffect -lbassboosteffect -ldistanceattenuationeffect -ldopplerbase -leffectbase -lenvironmentalreverbeffect -llistenerdopplereffect -llistenerlocationeffect -llistenerorientationeffect -llocationbase -lloudnesseffect -lorientationbase -lsourcedopplereffect -lsourcelocationeffect -lsourceorientationeffect -lstereowideningeffect
+ } else {
+ LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
+ }
# This is needed for having the .qtplugin file properly created on Symbian.
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend