From 4dc0229196a2f4dca58c3449b8489eabd311b5ce 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:28:53 +0200
Subject: Tweaked boost detection a bit.


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()
-- 
cgit v0.10.2-6-g49f6