From 173ad94b6edfafa614700e7ccb66f7d30ef98a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 7 Aug 2012 22:14:54 +0200
Subject: Fixed build.


diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 1914a66..eca0d38 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -19,8 +19,8 @@ if env["SCONS_STAGE"] == "flags" :
 if env["SCONS_STAGE"] == "build" :
 	myenv = env.Clone()
 	myenv.BuildVersion("BuildVersion.h", project = "swift")
-	myenv.MergeFlags(env["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(env["BOOST_FLAGS"])
+	myenv.UseFlags(env["SWIFTEN_FLAGS"])
+	myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
 	myenv.StaticLibrary("SwiftControllers", [
 			"Chat/ChatController.cpp",
 			"Chat/ChatControllerBase.cpp",
-- 
cgit v0.10.2-6-g49f6