Updated Carve bundling script and patches
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 17 Jan 2012 18:47:02 +0000 (18:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 17 Jan 2012 18:47:02 +0000 (18:47 +0000)
extern/carve/bundle.sh
extern/carve/patches/gcc46.patch [new file with mode: 0644]
extern/carve/patches/mingw.patch [new file with mode: 0644]
extern/carve/patches/series

index cbc1fe6d2d59e2e7a6f992c95c80a4bea8fe6f2f..3f9028619a53892ff314116ca92d61023f73c34e 100755 (executable)
@@ -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'])
diff --git a/extern/carve/patches/gcc46.patch b/extern/carve/patches/gcc46.patch
new file mode 100644 (file)
index 0000000..a8384dc
--- /dev/null
@@ -0,0 +1,11 @@
+diff -r 525472fb477a include/carve/polyline_iter.hpp
+--- a/include/carve/polyline_iter.hpp  Sun Jan 15 23:07:40 2012 -0500
++++ b/include/carve/polyline_iter.hpp  Wed Jan 18 00:41:13 2012 +0600
+@@ -20,6 +20,7 @@
+ #include <list>
+ #include <iterator>
+ #include <limits>
++#include <cstddef>
+ #include <carve/polyline_decl.hpp>
diff --git a/extern/carve/patches/mingw.patch b/extern/carve/patches/mingw.patch
new file mode 100644 (file)
index 0000000..c237edf
--- /dev/null
@@ -0,0 +1,15 @@
+diff -r 525472fb477a include/carve/win32.h
+--- a/include/carve/win32.h    Sun Jan 15 23:07:40 2012 -0500
++++ b/include/carve/win32.h    Wed Jan 18 00:40:10 2012 +0600
+@@ -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);
index 6e2a36a057685159f1866e29494f44ecc059baad..585d90659bd9ebfc74745df3496ed4879a218b3e 100644 (file)
@@ -2,3 +2,5 @@ strict_flags.patch
 includes.patch
 win32.patch
 mesh_iterator.patch
+mingw.patch
+gcc46.patch