From 3d6bfcba7ede52f222369adbb0230f5b51e39dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be> Date: Thu, 28 Oct 2010 23:33:16 +0200 Subject: Only match against Boost MT library. 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 "" -- cgit v0.10.2-6-g49f6