Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-08-16 17:15:36 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-16 17:15:36 (GMT) |
| commit | 9b594b480fea33624fcf636adfa455aba5efb97f (patch) | |
| tree | d34bb0ed34d0bd19ce07b1187bfcf22fc3c0a399 /3rdParty/Boost | |
| parent | 00a26ca1c2d3f753599d5608b18726996beeb4b1 (diff) | |
| download | swift-contrib-9b594b480fea33624fcf636adfa455aba5efb97f.zip swift-contrib-9b594b480fea33624fcf636adfa455aba5efb97f.tar.bz2 | |
More build system tweaks.
Diffstat (limited to '3rdParty/Boost')
| -rw-r--r-- | 3rdParty/Boost/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index 9181425..0c01051 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -105,7 +105,8 @@ elif env.get("BOOST_BUNDLED", False) : "src/libs/thread/src/win32/tss_dll.cpp", "src/libs/thread/src/win32/tss_pe.cpp"] - myenv.StaticLibrary("Boost", sources, CPPFLAGS = cppflags, CPPDEFINES = cppdefines) + myenv.MergeFlags(myenv["BOOST_FLAGS"]) + myenv.StaticLibrary("Boost", sources) if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") : bcp_env = myenv.Clone() |