summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-10 20:30:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-10 20:30:30 (GMT)
commit7459eb89d67db4d1245603b3c7cde1140a999474 (patch)
treed9c9418f3f21fe342c5e492719e0f246e026f41d /BuildTools
parent2cf66be04453bb212948e720d08dca4cfa96b35c (diff)
downloadswift-7459eb89d67db4d1245603b3c7cde1140a999474.zip
swift-7459eb89d67db4d1245603b3c7cde1140a999474.tar.bz2
Fix SCons build on windows.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/Tools/qt4.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 6df945b..1eb1273 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -463,6 +463,8 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","QtAssistant")])
modules.remove("QtAssistant")
modules.append("QtAssistantClient")
+ # FIXME: Phonon Hack
+ self.AppendUnique(LIBS=['phonon4'+debugSuffix])
self.AppendUnique(LIBS=[lib+'4'+debugSuffix for lib in modules if lib not in staticModules])
self.PrependUnique(LIBS=[lib+debugSuffix for lib in modules if lib in staticModules])
if 'QtOpenGL' in modules:
@@ -482,6 +484,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
self.AppendUnique(LINKFLAGS="-F$QTDIR/lib")
self.AppendUnique(CPPFLAGS="-F$QTDIR/lib")
self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean!
+ # FIXME: Phonon Hack
self.Append(LINKFLAGS=['-framework', "phonon"])
if debug : debugSuffix = 'd'
for module in modules :