Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-28 21:28:53 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-28 21:28:53 (GMT) |
| commit | 4dc0229196a2f4dca58c3449b8489eabd311b5ce (patch) | |
| tree | fd35d9f230f4d7c17dcf222ae998295c452f5746 | |
| parent | 95f8ec0dc58b7a605c51d1e09d68929c4ce9bb37 (diff) | |
| download | swift-4dc0229196a2f4dca58c3449b8489eabd311b5ce.zip swift-4dc0229196a2f4dca58c3449b8489eabd311b5ce.tar.bz2 | |
Tweaked boost detection a bit.
| -rw-r--r-- | BuildTools/SCons/SConstruct | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 182e5d6..9360827 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -336,13 +336,14 @@ if boost_prefix : if env["PLATFORM"] == "win32" : if os.path.isdir(os.path.join(boost_prefix, "lib")) : for file in os.listdir(os.path.join(boost_prefix, "lib")) : - m = re.match("(lib)?boost_signals(-(.*)).lib", file) + m = re.match("(lib)?boost_signals(-(.*)-(mt|s)-1(.*)).lib", file) if m : - # Give precedence over the multi-threaded version - if not boost_win32_libsuffix or not "-mt-" in boost_win32_libsuffix : + # Give precedence over the dynamic + print "Considering " + file + if not boost_win32_libsuffix or "-s-" in boost_win32_libsuffix : boost_win32_libsuffix = m.group(2) boost_win32_libprefix = m.group(1) if m.group(1) else "" - if "-mt" in boost_win32_libsuffix : + if not "-s-" in boost_win32_libsuffix : env["BOOST_FLAGS"]["CPPDEFINES"] = ["BOOST_ALL_DYN_LINK"] boost_env = conf_env.Clone() |