From 2d8b89074c21627bd2c9c94357ca158868937da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 18 Jun 2011 13:11:39 +0200
Subject: Use UseFlags for compiling the unit test.


diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 76abbcb..8cc43b9 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -8,21 +8,21 @@ if env["TEST"] :
 		env["UNITTEST_OBJECTS"] = []
 	if env["SCONS_STAGE"] == "test" :
 		myenv = env.Clone()
-		myenv.MergeFlags(env.get("CHECKER_FLAGS",""))
-		myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
-		myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
-		myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
-		myenv.MergeFlags(env.get("LIMBER_FLAGS",""))
-		myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
-		myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
-		myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))
-		myenv.MergeFlags(env.get("BOOST_FLAGS", ""))
-		myenv.MergeFlags(env.get("SQLITE_FLAGS", ""))
-		myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
-		myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
-		myenv.MergeFlags(env.get("ZLIB_FLAGS", ""))
-		myenv.MergeFlags(env.get("OPENSSL_FLAGS", ""))
-		myenv.MergeFlags(env["PLATFORM_FLAGS"])
+		myenv.UseFlags(env.get("CHECKER_FLAGS",""))
+		myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
+		myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
+		myenv.UseFlags(env.get("SWIFTOOLS_FLAGS",""))
+		myenv.UseFlags(env.get("LIMBER_FLAGS",""))
+		myenv.UseFlags(env.get("SWIFTEN_FLAGS",""))
+		myenv.UseFlags(env.get("CPPUNIT_FLAGS",""))
+		myenv.UseFlags(env.get("LIBIDN_FLAGS", ""))
+		myenv.UseFlags(env.get("BOOST_FLAGS", ""))
+		myenv.UseFlags(env.get("SQLITE_FLAGS", ""))
+		myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
+		myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
+		myenv.UseFlags(env.get("ZLIB_FLAGS", ""))
+		myenv.UseFlags(env.get("OPENSSL_FLAGS", ""))
+		myenv.UseFlags(env["PLATFORM_FLAGS"])
 		if env.get("HAVE_LIBXML") :
 			myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
 		if env.get("HAVE_EXPAT") :
-- 
cgit v0.10.2-6-g49f6


From ba4393a545d1b8a9a220f920f2257691dc59fa39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 18 Jun 2011 13:18:53 +0200
Subject: MergeFlags->UseFlags in Slimber.


diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index 422b56c..ae17e75 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -2,15 +2,15 @@ Import("env")
 
 myenv = env.Clone()
 myenv.UseFlags(env["LIMBER_FLAGS"])
-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["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.Program("slimber", [
 		"main.cpp",
-- 
cgit v0.10.2-6-g49f6


From 03ac748794af0b8c732df6bd32fcdd4fc3a93d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 18 Jun 2011 13:24:58 +0200
Subject: Fixed flag order in Slimber.


diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index ae17e75..04e4976 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -1,8 +1,8 @@
 Import("env")
 
 myenv = env.Clone()
-myenv.UseFlags(env["LIMBER_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"])
-- 
cgit v0.10.2-6-g49f6


From 94373e3eac30fe3c1ad5565f436fa3aad212a576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 18 Jun 2011 13:28:51 +0200
Subject: Fixed compilation of Slimber/Qt.


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"])
-- 
cgit v0.10.2-6-g49f6