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
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
|
diff -Npur blender-2.63.orig/extern/libmv/bundle.sh blender-2.63/extern/libmv/bundle.sh
--- blender-2.63.orig/extern/libmv/bundle.sh 2012-05-07 23:04:15.864563037 +0200
+++ blender-2.63/extern/libmv/bundle.sh 2012-05-07 23:05:15.112561992 +0200
@@ -120,13 +120,13 @@ cat > CMakeLists.txt << EOF
set(INC
.
- ../Eigen3
third_party/ssba
third_party/ldl/Include
../colamd/Include
)
set(INC_SYS
+ /usr/include/eigen3
\${PNG_INCLUDE_DIR}
\${ZLIB_INCLUDE_DIRS}
)
@@ -244,7 +244,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
src = env.Glob("*.cpp")
$src
-incs = '. ../Eigen3'
+incs = '. /usr/include/eigen3'
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
diff -Npur blender-2.63.orig/extern/libmv/CMakeLists.txt blender-2.63/extern/libmv/CMakeLists.txt
--- blender-2.63.orig/extern/libmv/CMakeLists.txt 2012-05-07 23:04:15.860563037 +0200
+++ blender-2.63/extern/libmv/CMakeLists.txt 2012-05-07 23:05:34.148561654 +0200
@@ -28,13 +28,13 @@
set(INC
.
- ../Eigen3
third_party/ssba
third_party/ldl/Include
../colamd/Include
)
set(INC_SYS
+ /usr/include/eigen3
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
diff -Npur blender-2.63.orig/extern/libmv/SConscript blender-2.63/extern/libmv/SConscript
--- blender-2.63.orig/extern/libmv/SConscript 2012-05-07 23:04:15.860563037 +0200
+++ blender-2.63/extern/libmv/SConscript 2012-05-07 23:05:51.208561352 +0200
@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/
src += env.Glob('third_party/ssba/Geometry/*.cpp')
src += env.Glob('third_party/ssba/Math/*.cpp')
-incs = '. ../Eigen3'
+incs = '. /usr/include/eigen3'
incs += ' ' + env['BF_PNG_INC']
incs += ' ' + env['BF_ZLIB_INC']
diff -Npur blender-2.63.orig/intern/dualcon/SConscript blender-2.63/intern/dualcon/SConscript
--- blender-2.63.orig/intern/dualcon/SConscript 2012-05-07 23:04:16.045563034 +0200
+++ blender-2.63/intern/dualcon/SConscript 2012-05-07 23:10:26.690556512 +0200
@@ -3,7 +3,7 @@ Import ('env')
sources = env.Glob('intern/*.cpp')
-incs = '. ../../extern/Eigen3'
+incs = '. /usr/include/eigen3'
defs = ''
env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
Les fichiers binaires blender-2.63.orig/intern/dualcon/.SConscript.swp et blender-2.63/intern/dualcon/.SConscript.swp sont différents.
diff -Npur blender-2.63.orig/intern/itasc/CMakeLists.txt blender-2.63/intern/itasc/CMakeLists.txt
--- blender-2.63.orig/intern/itasc/CMakeLists.txt 2012-05-07 23:04:16.048563034 +0200
+++ blender-2.63/intern/itasc/CMakeLists.txt 2012-05-07 23:07:37.219559480 +0200
@@ -24,11 +24,11 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- ../../extern/Eigen3
+
)
set(INC_SYS
-
+ /usr/include/eigen3
)
set(SRC
@@ -121,201 +121,201 @@ set(SRC
kdl/framevel.inl
# until we have another user...
- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
- ../../extern/Eigen3/Eigen/src/misc/Kernel.h
- ../../extern/Eigen3/Eigen/src/misc/Image.h
- ../../extern/Eigen3/Eigen/src/misc/Solve.h
- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
- ../../extern/Eigen3/Eigen/src/StlSupport/details.h
- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
- ../../extern/Eigen3/Eigen/src/Householder/Householder.h
- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
- ../../extern/Eigen3/Eigen/src/LU/Determinant.h
- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
- ../../extern/Eigen3/Eigen/src/LU/Inverse.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
- ../../extern/Eigen3/Eigen/src/Core/Swap.h
- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
- ../../extern/Eigen3/Eigen/src/Core/Stride.h
- ../../extern/Eigen3/Eigen/src/Core/Matrix.h
- ../../extern/Eigen3/Eigen/src/Core/Visitor.h
- ../../extern/Eigen3/Eigen/src/Core/Array.h
- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
- ../../extern/Eigen3/Eigen/src/Core/Random.h
- ../../extern/Eigen3/Eigen/src/Core/Redux.h
- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
- ../../extern/Eigen3/Eigen/src/Core/Select.h
- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
- ../../extern/Eigen3/Eigen/src/Core/Dot.h
- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
- ../../extern/Eigen3/Eigen/src/Core/Product.h
- ../../extern/Eigen3/Eigen/src/Core/Transpose.h
- ../../extern/Eigen3/Eigen/src/Core/Block.h
- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
- ../../extern/Eigen3/Eigen/src/Core/MapBase.h
- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
- ../../extern/Eigen3/Eigen/src/Core/IO.h
- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
- ../../extern/Eigen3/Eigen/src/Core/Reverse.h
- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
- ../../extern/Eigen3/Eigen/src/Core/Map.h
- ../../extern/Eigen3/Eigen/src/Core/Functors.h
- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
- ../../extern/Eigen3/Eigen/src/Core/Replicate.h
- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
- ../../extern/Eigen3/Eigen/src/Core/Assign.h
- ../../extern/Eigen3/Eigen/src/Core/Flagged.h
- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
+ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
+ /usr/include/eigen3/Eigen/src/misc/Kernel.h
+ /usr/include/eigen3/Eigen/src/misc/Image.h
+ /usr/include/eigen3/Eigen/src/misc/Solve.h
+ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
+ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
+ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
+ /usr/include/eigen3/Eigen/src/StlSupport/details.h
+ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h
+ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
+ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
+ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
+ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
+ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
+ /usr/include/eigen3/Eigen/src/Householder/Householder.h
+ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
+ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
+ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
+ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
+ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
+ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
+ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
+ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
+ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
+ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
+ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
+ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
+ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h
+ /usr/include/eigen3/Eigen/src/Geometry/Translation.h
+ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
+ /usr/include/eigen3/Eigen/src/Geometry/Transform.h
+ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
+ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
+ /usr/include/eigen3/Eigen/src/LU/Determinant.h
+ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
+ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h
+ /usr/include/eigen3/Eigen/src/LU/Inverse.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
+ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
+ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
+ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
+ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h
+ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
+ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
+ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
+ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
+ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
+ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h
+ /usr/include/eigen3/Eigen/src/Core/Swap.h
+ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
+ /usr/include/eigen3/Eigen/src/Core/DenseBase.h
+ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
+ /usr/include/eigen3/Eigen/src/Core/ProductBase.h
+ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
+ /usr/include/eigen3/Eigen/src/Core/Stride.h
+ /usr/include/eigen3/Eigen/src/Core/Matrix.h
+ /usr/include/eigen3/Eigen/src/Core/Visitor.h
+ /usr/include/eigen3/Eigen/src/Core/Array.h
+ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
+ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
+ /usr/include/eigen3/Eigen/src/Core/EigenBase.h
+ /usr/include/eigen3/Eigen/src/Core/Random.h
+ /usr/include/eigen3/Eigen/src/Core/Redux.h
+ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
+ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
+ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
+ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
+ /usr/include/eigen3/Eigen/src/Core/util/Memory.h
+ /usr/include/eigen3/Eigen/src/Core/util/Meta.h
+ /usr/include/eigen3/Eigen/src/Core/util/Constants.h
+ /usr/include/eigen3/Eigen/src/Core/util/Macros.h
+ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
+ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
+ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
+ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
+ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h
+ /usr/include/eigen3/Eigen/src/Core/Transpositions.h
+ /usr/include/eigen3/Eigen/src/Core/Select.h
+ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
+ /usr/include/eigen3/Eigen/src/Core/Dot.h
+ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
+ /usr/include/eigen3/Eigen/src/Core/Product.h
+ /usr/include/eigen3/Eigen/src/Core/Transpose.h
+ /usr/include/eigen3/Eigen/src/Core/Block.h
+ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
+ /usr/include/eigen3/Eigen/src/Core/MapBase.h
+ /usr/include/eigen3/Eigen/src/Core/NoAlias.h
+ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
+ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
+ /usr/include/eigen3/Eigen/src/Core/IO.h
+ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
+ /usr/include/eigen3/Eigen/src/Core/Reverse.h
+ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h
+ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h
+ /usr/include/eigen3/Eigen/src/Core/StableNorm.h
+ /usr/include/eigen3/Eigen/src/Core/NumTraits.h
+ /usr/include/eigen3/Eigen/src/Core/Map.h
+ /usr/include/eigen3/Eigen/src/Core/Functors.h
+ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h
+ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
+ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
+ /usr/include/eigen3/Eigen/src/Core/NestByValue.h
+ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
+ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
+ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h
+ /usr/include/eigen3/Eigen/src/Core/Diagonal.h
+ /usr/include/eigen3/Eigen/src/Core/Replicate.h
+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
+ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
+ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
+ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
+ /usr/include/eigen3/Eigen/src/Core/Assign.h
+ /usr/include/eigen3/Eigen/src/Core/Flagged.h
+ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
+ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h
)
if(WIN32)
diff -Npur blender-2.63.orig/intern/itasc/SConscript blender-2.63/intern/itasc/SConscript
--- blender-2.63.orig/intern/itasc/SConscript 2012-05-07 23:04:16.048563034 +0200
+++ blender-2.63/intern/itasc/SConscript 2012-05-07 23:08:05.272558981 +0200
@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
sources += env.Glob('kdl/*.cpp')
sources += env.Glob('kdl/utilities/*.cpp')
-incs = '. ../../extern/Eigen3'
+incs = '. /usr/include/eigen3'
defs = []
diff -Npur blender-2.63.orig/source/blender/ikplugin/CMakeLists.txt blender-2.63/source/blender/ikplugin/CMakeLists.txt
--- blender-2.63.orig/source/blender/ikplugin/CMakeLists.txt 2012-05-07 23:04:16.028563034 +0200
+++ blender-2.63/source/blender/ikplugin/CMakeLists.txt 2012-05-07 23:08:47.476558205 +0200
@@ -49,9 +49,11 @@ set(SRC
if(WITH_IK_ITASC)
add_definitions(-DWITH_IK_ITASC)
list(APPEND INC
- ../../../extern/Eigen3
../../../intern/itasc
)
+ list(APPEND INC_SYS
+ /usr/include/eigen3
+ )
list(APPEND SRC
intern/itasc_plugin.cpp
)
diff -Npur blender-2.63.orig/source/blender/ikplugin/SConscript blender-2.63/source/blender/ikplugin/SConscript
--- blender-2.63.orig/source/blender/ikplugin/SConscript 2012-05-07 23:04:16.028563034 +0200
+++ blender-2.63/source/blender/ikplugin/SConscript 2012-05-07 23:09:13.004557784 +0200
@@ -4,7 +4,7 @@ defs = []
sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3'
defs.append('WITH_IK_ITASC')
diff -Npur blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63/source/gameengine/Converter/CMakeLists.txt
--- blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:04:15.895563037 +0200
+++ blender-2.63/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:09:46.375557194 +0200
@@ -50,7 +50,6 @@ set(INC
../../blender/makesrna
../../blender/windowmanager
../../../extern/bullet2/src
- ../../../extern/Eigen3
../../../intern/container
../../../intern/guardedalloc
../../../intern/moto/include
@@ -59,7 +58,7 @@ set(INC
)
set(INC_SYS
-
+ /usr/include/eigen3
)
set(SRC
diff -Npur blender-2.63.orig/source/gameengine/Converter/SConscript blender-2.63/source/gameengine/Converter/SConscript
--- blender-2.63.orig/source/gameengine/Converter/SConscript 2012-05-07 23:04:15.895563037 +0200
+++ blender-2.63/source/gameengine/Converter/SConscript 2012-05-07 23:10:09.611556783 +0200
@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager'
incs += ' #source/blender/makesrna'
incs += ' #source/blender/ikplugin'
incs += ' #extern/recastnavigation/Detour/Include'
-incs += ' #extern/Eigen3'
+incs += ' /usr/include/eigen3'
incs += ' ' + env['BF_BULLET_INC']
|
GitWeb