[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43474] trunk/blender/extern/carve: Updated Carve bundling script and patches

[Sergey Sharybin]

Revision: 43474
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43474
Author:   nazgul
Date:     2012-01-17 18:47:02 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Updated Carve bundling script and patches

Modified Paths:
--------------
    trunk/blender/extern/carve/bundle.sh
    trunk/blender/extern/carve/patches/series

Added Paths:
-----------
    trunk/blender/extern/carve/patches/gcc46.patch
    trunk/blender/extern/carve/patches/mingw.patch

Modified: trunk/blender/extern/carve/bundle.sh
===================================================================
--- trunk/blender/extern/carve/bundle.sh	2012-01-17 18:33:08 UTC (rev 43473)
+++ trunk/blender/extern/carve/bundle.sh	2012-01-17 18:47:02 UTC (rev 43474)
@@ -114,7 +114,8 @@
 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'])

Added: trunk/blender/extern/carve/patches/gcc46.patch
===================================================================
--- trunk/blender/extern/carve/patches/gcc46.patch	                        (rev 0)
+++ trunk/blender/extern/carve/patches/gcc46.patch	2012-01-17 18:47:02 UTC (rev 43474)
@@ -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>
+ 

Added: trunk/blender/extern/carve/patches/mingw.patch
===================================================================
--- trunk/blender/extern/carve/patches/mingw.patch	                        (rev 0)
+++ trunk/blender/extern/carve/patches/mingw.patch	2012-01-17 18:47:02 UTC (rev 43474)
@@ -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);

Modified: trunk/blender/extern/carve/patches/series
===================================================================
--- trunk/blender/extern/carve/patches/series	2012-01-17 18:33:08 UTC (rev 43473)
+++ trunk/blender/extern/carve/patches/series	2012-01-17 18:47:02 UTC (rev 43474)
@@ -2,3 +2,5 @@
 includes.patch
 win32.patch
 mesh_iterator.patch
+mingw.patch
+gcc46.patch