From 02d6188ab335e6c62b8341b84579d9549d215118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Mon, 14 Mar 2011 19:28:10 +0100
Subject: Force the use of Boost Filesystem V2.

Resolves: #783
Release-Notes: Fixed compilation on systems with a recent version of Boost installed.

diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 3c815b6..562b1b0 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -19,7 +19,7 @@ elif env.get("BOOST_BUNDLED", False) :
 # Common
 ################################################################################
 
-	cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED"]
+	cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED", ("BOOST_FILESYSTEM_VERSION", "2")]
 	#if env["PLATFORM"] == "darwin" :
 	#	cppdefines += ["BOOST_ASIO_DISABLE_KQUEUE"]
 	if env["PLATFORM"] == "win32" :
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index cb248a5..f1f437a 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -352,6 +352,7 @@ conf.Finish()
 # Boost
 boost_conf_env = conf_env.Clone()
 boost_flags = {}
+boost_flags["CPPDEFINES"] = [("BOOST_FILESYSTEM_VERSION", "2")]
 if env.get("boost_libdir", None) :
 	boost_flags["LIBPATH"] = [env["boost_libdir"]]
 if env.get("boost_includedir", None) :
-- 
cgit v0.10.2-6-g49f6