diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-17 22:47:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-17 22:47:02 +0400 |
| commit | 0621373dd58161d75858e36f8387b436b18ac378 (patch) | |
| tree | 1c9d03dd996f3e54d1af52df418917e04eb4025d /extern/carve/bundle.sh | |
| parent | 408f7963c5cfd65792d826390b01896282de8e97 (diff) | |
Updated Carve bundling script and patches
Diffstat (limited to 'extern/carve/bundle.sh')
| -rwxr-xr-x | extern/carve/bundle.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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']) |