diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-17 14:32:17 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-17 14:32:17 +0400 |
| commit | 7a85ad51bfc302748b912ec6b69f647b6fd131b7 (patch) | |
| tree | ffc3ffa64a49d47b05283527b94273d882ececdf /extern | |
| parent | 62f440a0b2d9a074de24ef0891d03c536f25cc1a (diff) | |
Compilation error when using mingw+scons
Error was caused by boost library (which doesn't seem to be working with Cycles too
when compiling with mingw). Switched mingw to use TR1 unordered collections. Also,
there was re-declaration of strcasecmp when mingw is used.
Additional changes are related on using own process spawning when BF_TOOLSET is set to
mingw. Seems to be working fine now (i've got too long command line error) and no
warning are supressing now (as it was told in comment for commented own process spawning).
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/carve/SConscript | 3 | ||||
| -rwxr-xr-x | extern/carve/include/carve/win32.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/extern/carve/SConscript b/extern/carve/SConscript index 4a87b825186..e2f3c814e2e 100644 --- a/extern/carve/SConscript +++ b/extern/carve/SConscript @@ -14,7 +14,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']) diff --git a/extern/carve/include/carve/win32.h b/extern/carve/include/carve/win32.h index b73c9535f52..5f8ce3b3bf6 100755 --- a/extern/carve/include/carve/win32.h +++ b/extern/carve/include/carve/win32.h @@ -8,9 +8,11 @@ #include <string.h> #include <stdlib.h> +#if !defined(__MINGW32__) inline int strcasecmp(const char *a, const char *b) { return _stricmp(a,b); } +#endif inline void srandom(unsigned long input) { srand(input); |