Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-28 21:33:16 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-28 21:33:16 (GMT) |
| commit | 3d6bfcba7ede52f222369adbb0230f5b51e39dea (patch) | |
| tree | 53868bf7380add2534fe0e876b618d3fbc567ba7 /BuildTools | |
| parent | 4dc0229196a2f4dca58c3449b8489eabd311b5ce (diff) | |
| download | swift-contrib-3d6bfcba7ede52f222369adbb0230f5b51e39dea.zip swift-contrib-3d6bfcba7ede52f222369adbb0230f5b51e39dea.tar.bz2 | |
Only match against Boost MT library.
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 9360827..e241746 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -336,10 +336,9 @@ 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(-(.*)-(mt|s)-1(.*)).lib", file) + m = re.match("(lib)?boost_signals(-(.*)-mt-(s-)?1(.*)).lib", file) if m : # 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 "" |