diff options
author | Remko Tronçon <git@el-tramo.be> | 2012-07-15 10:04:15 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2012-07-15 10:18:32 (GMT) |
commit | fef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7 (patch) | |
tree | 855df2beab9bfdb9b1da9d87a3abf809f6959e80 /Swift | |
parent | 69f2b252162b47ba174aab6b283b724d33fc38d7 (diff) | |
download | swift-fef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7.zip swift-fef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7.tar.bz2 |
Fixed compilation on Windows.
Diffstat (limited to 'Swift')
-rw-r--r-- | Swift/Controllers/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript index 70085a6..1914a66 100644 --- a/Swift/Controllers/SConscript +++ b/Swift/Controllers/SConscript @@ -19,6 +19,7 @@ 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.StaticLibrary("SwiftControllers", [ "Chat/ChatController.cpp", |