From efea21c130186552ed399577d271535a05ec9d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 28 Oct 2010 22:43:05 +0200
Subject: Fixed SCons error.


diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 23bd973..e008140 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -324,10 +324,13 @@ conf.Finish()
 
 # Boost
 env["BOOST_FLAGS"] = {}
-boost_prefix = env.get("boost", None)
+boost_prefix = env["boost"] if isinstance(env["boost"], str) else None
 if boost_prefix :
-	env["BOOST_FLAGS"]["CPPPATH"] = [os.path.join(boost_prefix, "include")]
+	# FIXME: Only use the include flag that has the includes
+	env["BOOST_FLAGS"]["CPPPATH"] = [os.path.join(boost_prefix, "include"), os.path.join(boost_prefix)]
 	env["BOOST_FLAGS"]["LIBPATH"] = [os.path.join(boost_prefix, "lib")]
+	# Try to auto detect the suffix from the boost libraries
+
 boost_env = conf_env.Clone()
 boost_env.MergeFlags(env["BOOST_FLAGS"])
 boost_conf = Configure(boost_env)
-- 
cgit v0.10.2-6-g49f6