1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
diff -Npur blender-2.63a.orig/build_files/scons/config/linux-config.py blender-2.63a/build_files/scons/config/linux-config.py
--- blender-2.63a.orig/build_files/scons/config/linux-config.py 2012-06-05 10:22:45.044779939 +0200
+++ blender-2.63a/build_files/scons/config/linux-config.py 2012-06-05 10:23:37.799779017 +0200
@@ -192,6 +192,11 @@ BF_EXPAT = '/usr'
BF_EXPAT_LIB = 'expat'
BF_EXPAT_LIBPATH = '/usr/lib'
+WITH_BF_COLAMD = True
+BF_COLAMD = '#extern/colamd'
+BF_COLAMD_INC = '${BF_COLAMD}/include'
+BF_COLAMD_LIB = 'extern_colamd'
+
WITH_BF_JEMALLOC = False
WITH_BF_STATICJEMALLOC = False
BF_JEMALLOC = '/usr'
diff -Npur blender-2.63a.orig/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py
--- blender-2.63a.orig/build_files/scons/tools/Blender.py 2012-06-05 10:22:45.044779939 +0200
+++ blender-2.63a/build_files/scons/tools/Blender.py 2012-06-05 10:24:13.545778374 +0200
@@ -281,6 +281,8 @@ def setup_syslibs(lenv):
else:
syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
syslibs.append(lenv['BF_EXPAT_LIB'])
+ if lenv['WITH_BF_COLAMD']:
+ syslibs += Split(lenv['BF_COLAMD_LIB'])
if lenv['WITH_BF_JEMALLOC']:
if not lenv['WITH_BF_STATICJEMALLOC']:
diff -Npur blender-2.63a.orig/build_files/scons/tools/btools.py blender-2.63a/build_files/scons/tools/btools.py
--- blender-2.63a.orig/build_files/scons/tools/btools.py 2012-06-05 10:22:45.044779939 +0200
+++ blender-2.63a/build_files/scons/tools/btools.py 2012-06-05 10:25:35.893776920 +0200
@@ -126,6 +126,7 @@ def validate_arguments(args, bc):
'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB',
'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER',
'WITH_BF_BINRELOC',
@@ -455,6 +456,11 @@ def read_opts(env, cfg, args):
('BF_EXPAT_LIB', 'Expat library', ''),
('BF_EXPAT_LIBPATH', 'Expat library path', ''),
+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)),
+ ('BF_COLAMD', 'Colamd base dir', ''),
+ ('BF_COLAMD_INC', 'Colamd include path', ''),
+ ('BF_COLAMD_LIB', 'Colamd library', ''),
+
(BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
(BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
('BF_JEMALLOC', 'jemalloc base path', ''),
diff -Npur blender-2.63a.orig/extern/CMakeLists.txt blender-2.63a/extern/CMakeLists.txt
--- blender-2.63a.orig/extern/CMakeLists.txt 2012-06-05 10:22:45.042779939 +0200
+++ blender-2.63a/extern/CMakeLists.txt 2012-06-05 10:28:25.888773912 +0200
@@ -26,8 +26,6 @@
# Otherwise we get warnings here that we cant fix in external projects
remove_strict_flags()
-add_subdirectory(colamd)
-
if(WITH_MOD_CLOTH_ELTOPO)
add_subdirectory(eltopo)
endif()
diff -Npur blender-2.63a.orig/extern/SConscript blender-2.63a/extern/SConscript
--- blender-2.63a.orig/extern/SConscript 2012-06-05 10:22:45.040779940 +0200
+++ blender-2.63a/extern/SConscript 2012-06-05 10:30:34.186771644 +0200
@@ -2,8 +2,6 @@
Import('env')
-SConscript(['colamd/SConscript'])
-
if env['WITH_BF_GAMEENGINE']:
SConscript(['recastnavigation/SConscript'])
diff -Npur blender-2.63a.orig/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt
--- blender-2.63a.orig/extern/libmv/CMakeLists.txt 2012-06-05 10:22:45.031779940 +0200
+++ blender-2.63a/extern/libmv/CMakeLists.txt 2012-06-05 10:29:01.992773273 +0200
@@ -30,13 +30,13 @@ set(INC
.
third_party/ssba
third_party/ldl/Include
- ../colamd/Include
)
set(INC_SYS
/usr/include/eigen3
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
+ ${COLAMD_INCLUDE_DIRS}
)
diff -Npur blender-2.63a.orig/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript
--- blender-2.63a.orig/extern/libmv/SConscript 2012-06-05 10:22:45.031779940 +0200
+++ blender-2.63a/extern/libmv/SConscript 2012-06-05 10:29:39.347772616 +0200
@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/*
incs = '. /usr/include/eigen3'
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
+incs += ' ' + env['BF_COLAMD_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
@@ -62,6 +63,6 @@ else:
ccflags_libmv += Split(env['REL_CCFLAGS'])
cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
+incs += ' ./third_party/ssba ./third_party/ldl/Include'
env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
diff -Npur blender-2.63a.orig/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh
--- blender-2.63a.orig/extern/libmv/bundle.sh 2012-06-05 10:22:45.036779940 +0200
+++ blender-2.63a/extern/libmv/bundle.sh 2012-06-05 10:27:33.882774833 +0200
@@ -122,13 +122,13 @@ set(INC
.
third_party/ssba
third_party/ldl/Include
- ../colamd/Include
)
set(INC_SYS
/usr/include/eigen3
\${PNG_INCLUDE_DIR}
\${ZLIB_INCLUDE_DIRS}
+ \${COLAMD_INCLUDE_DIRS}
)
@@ -247,6 +247,7 @@ $src
incs = '. /usr/include/eigen3'
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
+incs += ' ' + env['BF_COLAMD_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
@@ -276,7 +277,7 @@ else:
ccflags_libmv += Split(env['REL_CCFLAGS'])
cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
+incs += ' ./third_party/ssba ./third_party/ldl/Include'
env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
EOF
diff -Npur blender-2.63a.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
--- blender-2.63a.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-06-05 10:22:45.032779940 +0200
+++ blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-06-05 10:30:21.852771858 +0200
@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o
#if defined(V3DLIB_ENABLE_SUITESPARSE)
//# include "COLAMD/Include/colamd.h"
-# include "colamd.h"
+# include <colamd.h>
extern "C"
{
//# include "LDL/Include/ldl.h"
diff -Npur blender-2.63a.orig/intern/opennl/CMakeLists.txt blender-2.63a/intern/opennl/CMakeLists.txt
--- blender-2.63a.orig/intern/opennl/CMakeLists.txt 2012-06-05 10:22:45.235779936 +0200
+++ blender-2.63a/intern/opennl/CMakeLists.txt 2012-06-05 10:32:05.148770035 +0200
@@ -40,11 +40,10 @@ add_definitions(
set(INC
extern
superlu
- ../../extern/colamd/Include
)
set(INC_SYS
-
+ /usr/include
)
set(SRC
diff -Npur blender-2.63a.orig/intern/opennl/SConscript blender-2.63a/intern/opennl/SConscript
--- blender-2.63a.orig/intern/opennl/SConscript 2012-06-05 10:22:45.226779934 +0200
+++ blender-2.63a/intern/opennl/SConscript 2012-06-05 10:32:31.968769563 +0200
@@ -3,7 +3,7 @@ Import ('env')
sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
-incs = 'extern superlu ../../extern/colamd/Include'
+incs = 'extern superlu /usr/include'
if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')):
env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
diff -Npur blender-2.63a.orig/intern/opennl/superlu/get_perm_c.c blender-2.63a/intern/opennl/superlu/get_perm_c.c
--- blender-2.63a.orig/intern/opennl/superlu/get_perm_c.c 2012-06-05 10:22:45.225779935 +0200
+++ blender-2.63a/intern/opennl/superlu/get_perm_c.c 2012-06-05 10:32:53.570769182 +0200
@@ -10,7 +10,7 @@
*/
#include "ssp_defs.h"
-#include "colamd.h"
+#include <colamd.h>
extern int genmmd_(int *, int *, int *, int *, int *, int *, int *,
int *, int *, int *, int *, int *);
|
GitWeb