summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-08-07 20:14:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-08-07 20:14:54 (GMT)
commit173ad94b6edfafa614700e7ccb66f7d30ef98a10 (patch)
tree95840d92ed07b4b169001e6a77a185f0c73d2428 /Swift/Controllers/SConscript
parentfaf1fb428d50dc13b2f3632e601c5877c693e79b (diff)
downloadswift-173ad94b6edfafa614700e7ccb66f7d30ef98a10.zip
swift-173ad94b6edfafa614700e7ccb66f7d30ef98a10.tar.bz2
Fixed build.
Diffstat (limited to 'Swift/Controllers/SConscript')
-rw-r--r--Swift/Controllers/SConscript4
1 files changed, 2 insertions, 2 deletions
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",