forked from bartvdbraak/blender
Updated Carve bundling script and patches
This commit is contained in:
parent
408f7963c5
commit
0621373dd5
3
extern/carve/bundle.sh
vendored
3
extern/carve/bundle.sh
vendored
@ -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'])
|
||||
|
11
extern/carve/patches/gcc46.patch
vendored
Normal file
11
extern/carve/patches/gcc46.patch
vendored
Normal file
@ -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>
|
||||
|
15
extern/carve/patches/mingw.patch
vendored
Normal file
15
extern/carve/patches/mingw.patch
vendored
Normal file
@ -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);
|
2
extern/carve/patches/series
vendored
2
extern/carve/patches/series
vendored
@ -2,3 +2,5 @@ strict_flags.patch
|
||||
includes.patch
|
||||
win32.patch
|
||||
mesh_iterator.patch
|
||||
mingw.patch
|
||||
gcc46.patch
|
||||
|
Loading…
Reference in New Issue
Block a user