From 0621373dd58161d75858e36f8387b436b18ac378 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 17 Jan 2012 18:47:02 +0000 Subject: Updated Carve bundling script and patches --- extern/carve/bundle.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'extern/carve/bundle.sh') diff --git a/extern/carve/bundle.sh b/extern/carve/bundle.sh index cbc1fe6d2d5..3f9028619a5 100755 --- a/extern/carve/bundle.sh +++ b/extern/carve/bundle.sh @@ -114,7 +114,8 @@ incs = ['include'] if env['WITH_BF_BOOST']: if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'): # Boost is setting as preferred collections library in the Carve code when using MSVC compiler - defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS') + if env['OURPLATFORM'] != 'win32-mingw': + defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS') defs.append('CARVE_SYSTEM_BOOST') incs.append(env['BF_BOOST_INC']) -- cgit v1.2.3