Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-26 20:32:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-27 13:20:34 (GMT) |
| commit | 876ef43209a2d12f128b9258e9184c13ef8e8f10 (patch) | |
| tree | b5cc760c7bec5b660616e2cb5af7cde0abffb88f /3rdParty/Boost | |
| parent | f07aada8eec6f6dc9faccbe15f40c1e6f926e04a (diff) | |
| download | swift-contrib-876ef43209a2d12f128b9258e9184c13ef8e8f10.zip swift-contrib-876ef43209a2d12f128b9258e9184c13ef8e8f10.tar.bz2 | |
Prefix 3rdParty bundled libs with Swiften_.
Diffstat (limited to '3rdParty/Boost')
| -rw-r--r-- | 3rdParty/Boost/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index 159719c..b861b4a 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -31,7 +31,7 @@ elif env.get("BOOST_BUNDLED", False) : "CPPFLAGS": cppflags, "CPPDEFINES": cppdefines, "LIBPATH": [Dir(".")], - "LIBS": ["Boost"] + "LIBS": ["Swiften_Boost"] } if env["PLATFORM"] != "win32" : env["BOOST_FLAGS"]["LIBS"] += ["pthread"] @@ -106,7 +106,7 @@ elif env.get("BOOST_BUNDLED", False) : "src/libs/thread/src/win32/tss_pe.cpp"] myenv.MergeFlags(myenv["BOOST_FLAGS"]) - myenv.StaticLibrary("Boost", sources) + myenv.StaticLibrary("Swiften_Boost", sources) if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") : bcp_env = myenv.Clone() |