summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-08-29 18:06:03 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-08-29 18:08:06 (GMT)
commitbf9cfb6aa5bda0a33da6dfc12ef49321500256ed (patch)
treef65132bd5b1a27d54bd78858908ed6ae38b8fbc4 /Swift/QtUI
parent46b13c4d25270c6933d20c6aa790619e30e4cfe8 (diff)
downloadswift-bf9cfb6aa5bda0a33da6dfc12ef49321500256ed.zip
swift-bf9cfb6aa5bda0a33da6dfc12ef49321500256ed.tar.bz2
Put platform flags in PLATFORM_FLAGS variable.
This should avoid problems with --as-needed. Resolves: #547
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 0d043fb..f119397 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -35,6 +35,7 @@ myenv.MergeFlags(env["ZLIB_FLAGS"])
myenv.MergeFlags(env["OPENSSL_FLAGS"])
myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
+myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])