summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 11:42:25 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 11:42:25 (GMT)
commitc20ecae7c569befc8c970f839ce9e14410c118fb (patch)
treeb3b5bc4afae5c86ad0173cf2b09843e90bf262f2 /Slimber/Qt/SConscript
parent362b2d147e4050e997104c24b2ed2e818adab5ed (diff)
parent94373e3eac30fe3c1ad5565f436fa3aad212a576 (diff)
downloadswift-contrib-c20ecae7c569befc8c970f839ce9e14410c118fb.zip
swift-contrib-c20ecae7c569befc8c970f839ce9e14410c118fb.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed compilation of Slimber/Qt. Fixed flag order in Slimber. MergeFlags->UseFlags in Slimber. Use UseFlags for compiling the unit test.
Diffstat (limited to 'Slimber/Qt/SConscript')
-rw-r--r--Slimber/Qt/SConscript19
1 files changed, 10 insertions, 9 deletions
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
index c71d480..054d8b6 100644
--- a/Slimber/Qt/SConscript
+++ b/Slimber/Qt/SConscript
@@ -4,15 +4,16 @@ Import("env")
myenv = env.Clone()
myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
-myenv.MergeFlags(env["SLIMBER_FLAGS"])
-myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
-myenv.MergeFlags(env["SWIFTEN_FLAGS"])
-myenv.MergeFlags(env["LIBIDN_FLAGS"])
-myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
-myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
-myenv.MergeFlags(env.get("AVAHI_FLAGS", ""))
-myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+myenv.UseFlags(env["SLIMBER_FLAGS"])
+myenv.UseFlags(env["LIMBER_FLAGS"])
+myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
+myenv.UseFlags(env["SWIFTEN_FLAGS"])
+myenv.UseFlags(env["LIBIDN_FLAGS"])
+myenv.UseFlags(env["BOOST_FLAGS"])
+myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
+myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
+myenv.UseFlags(env.get("AVAHI_FLAGS", ""))
+myenv.UseFlags(myenv["PLATFORM_FLAGS"])
myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])