From b951e04a08f368dad564995813323fd098c70e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 18 Oct 2011 21:03:52 +0200
Subject: Use "UseFlags" instead of "MergeFlags" to set the Swift build flags.


diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 71dc59f..9417f63 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -21,25 +21,25 @@ Import("env")
 
 myenv = env.Clone()
 myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
-myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
-myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
+myenv.UseFlags(env["SWIFT_CONTROLLERS_FLAGS"])
+myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
 if myenv["HAVE_XSS"] :
-  myenv.MergeFlags(env["XSS_FLAGS"])
+  myenv.UseFlags(env["XSS_FLAGS"])
 if env["PLATFORM"] == "posix" :
   myenv.Append(LIBS = ["X11"])
 if myenv["HAVE_SPARKLE"] :
-  myenv.MergeFlags(env["SPARKLE_FLAGS"])
-myenv.MergeFlags(env["SWIFTEN_FLAGS"])
-myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"])
+  myenv.UseFlags(env["SPARKLE_FLAGS"])
+myenv.UseFlags(env["SWIFTEN_FLAGS"])
+myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
 if myenv.get("HAVE_GROWL", False) :
-	myenv.MergeFlags(myenv["GROWL_FLAGS"])
+	myenv.UseFlags(myenv["GROWL_FLAGS"])
 	myenv.Append(CPPDEFINES = ["HAVE_GROWL"])
 if myenv["swift_mobile"] :
 	myenv.Append(CPPDEFINES = ["SWIFT_MOBILE"])
 if myenv.get("HAVE_SNARL", False) :
-	myenv.MergeFlags(myenv["SNARL_FLAGS"])
+	myenv.UseFlags(myenv["SNARL_FLAGS"])
 	myenv.Append(CPPDEFINES = ["HAVE_SNARL"])
-myenv.MergeFlags(myenv["PLATFORM_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