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
|
--- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200
+++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200
@@ -5,7 +5,8 @@
sources += env.Glob('kdl/*.cpp')
sources += env.Glob('kdl/utilities/*.cpp')
-incs = '. ../../extern/Eigen2'
+#incs = '. ../../extern/Eigen2'
+incs = '. /usr/include/eigen2'
env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
--- source/blender/ikplugin/SConscript
+++ source/blender/ikplugin/SConscript
@@ -4,6 +4,6 @@
sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )
--- source/gameengine/Converter/SConscript 2009-09-26 09:14:02.000000000 +0200
+++ source/gameengine/Converter/SConscript 2009-09-26 09:14:54.000000000 +0200
@@ -21,7 +21,8 @@
incs += ' #source/blender/makesrna'
incs += ' #source/blender/ikplugin'
incs += ' #extern/recastnavigation/Detour/Include'
-incs += ' #extern/Eigen2'
+#incs += ' #extern/Eigen2'
+incs += ' /usr/include/eigen2'
incs += ' ' + env['BF_BULLET_INC']
--- intern/itasc/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
+++ intern/itasc/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
@@ -25,11 +25,11 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- ../../extern/Eigen2
+ /usr/include/eigen2
)
set(INC_SYS
-
+ /usr/include/eigen2
)
set(SRC
@@ -117,113 +117,113 @@ set(SRC
ublas_types.hpp
# until we have another user...
- ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h
- ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h
- ../../extern/Eigen2/Eigen/src/Array/Functors.h
- ../../extern/Eigen2/Eigen/src/Array/Norms.h
- ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h
- ../../extern/Eigen2/Eigen/src/Array/Random.h
- ../../extern/Eigen2/Eigen/src/Array/Select.h
- ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h
- ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h
- ../../extern/Eigen2/Eigen/src/Core/Assign.h
- ../../extern/Eigen2/Eigen/src/Core/Block.h
- ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h
- ../../extern/Eigen2/Eigen/src/Core/Coeffs.h
- ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h
- ../../extern/Eigen2/Eigen/src/Core/Cwise.h
- ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h
- ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h
- ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h
- ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h
- ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h
- ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h
- ../../extern/Eigen2/Eigen/src/Core/Dot.h
- ../../extern/Eigen2/Eigen/src/Core/Flagged.h
- ../../extern/Eigen2/Eigen/src/Core/Functors.h
- ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h
- ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h
- ../../extern/Eigen2/Eigen/src/Core/IO.h
- ../../extern/Eigen2/Eigen/src/Core/Map.h
- ../../extern/Eigen2/Eigen/src/Core/MapBase.h
- ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h
- ../../extern/Eigen2/Eigen/src/Core/Matrix.h
- ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h
- ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h
- ../../extern/Eigen2/Eigen/src/Core/Minor.h
- ../../extern/Eigen2/Eigen/src/Core/NestByValue.h
- ../../extern/Eigen2/Eigen/src/Core/NumTraits.h
- ../../extern/Eigen2/Eigen/src/Core/Part.h
- ../../extern/Eigen2/Eigen/src/Core/Product.h
- ../../extern/Eigen2/Eigen/src/Core/Redux.h
- ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h
- ../../extern/Eigen2/Eigen/src/Core/Sum.h
- ../../extern/Eigen2/Eigen/src/Core/Swap.h
- ../../extern/Eigen2/Eigen/src/Core/Transpose.h
- ../../extern/Eigen2/Eigen/src/Core/Visitor.h
- ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
- ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
- ../../extern/Eigen2/Eigen/src/Core/util/Constants.h
- ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
- ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
- ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h
- ../../extern/Eigen2/Eigen/src/Core/util/Macros.h
- ../../extern/Eigen2/Eigen/src/Core/util/Memory.h
- ../../extern/Eigen2/Eigen/src/Core/util/Meta.h
- ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h
- ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h
- ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h
- ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h
- ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h
- ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h
- ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h
- ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h
- ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h
- ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h
- ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h
- ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h
- ../../extern/Eigen2/Eigen/src/Geometry/Transform.h
- ../../extern/Eigen2/Eigen/src/Geometry/Translation.h
- ../../extern/Eigen2/Eigen/src/LU/Determinant.h
- ../../extern/Eigen2/Eigen/src/LU/Inverse.h
- ../../extern/Eigen2/Eigen/src/LU/LU.h
- ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h
- ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h
- ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h
- ../../extern/Eigen2/Eigen/src/QR/QR.h
- ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
- ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h
- ../../extern/Eigen2/Eigen/src/SVD/SVD.h
- ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
- ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h
- ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h
- ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h
- ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
- ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
- ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h
- ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h
- ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h
- ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h
- ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h
- ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
+ /usr/include/eigen2/Eigen/src/Array/BooleanRedux.h
+ /usr/include/eigen2/Eigen/src/Array/CwiseOperators.h
+ /usr/include/eigen2/Eigen/src/Array/Functors.h
+ /usr/include/eigen2/Eigen/src/Array/Norms.h
+ /usr/include/eigen2/Eigen/src/Array/PartialRedux.h
+ /usr/include/eigen2/Eigen/src/Array/Random.h
+ /usr/include/eigen2/Eigen/src/Array/Select.h
+ /usr/include/eigen2/Eigen/src/Cholesky/LDLT.h
+ /usr/include/eigen2/Eigen/src/Cholesky/LLT.h
+ /usr/include/eigen2/Eigen/src/Core/Assign.h
+ /usr/include/eigen2/Eigen/src/Core/Block.h
+ /usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
+ /usr/include/eigen2/Eigen/src/Core/Coeffs.h
+ /usr/include/eigen2/Eigen/src/Core/CommaInitializer.h
+ /usr/include/eigen2/Eigen/src/Core/Cwise.h
+ /usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
+ /usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
+ /usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
+ /usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
+ /usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h
+ /usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h
+ /usr/include/eigen2/Eigen/src/Core/Dot.h
+ /usr/include/eigen2/Eigen/src/Core/Flagged.h
+ /usr/include/eigen2/Eigen/src/Core/Functors.h
+ /usr/include/eigen2/Eigen/src/Core/Fuzzy.h
+ /usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h
+ /usr/include/eigen2/Eigen/src/Core/IO.h
+ /usr/include/eigen2/Eigen/src/Core/Map.h
+ /usr/include/eigen2/Eigen/src/Core/MapBase.h
+ /usr/include/eigen2/Eigen/src/Core/MathFunctions.h
+ /usr/include/eigen2/Eigen/src/Core/Matrix.h
+ /usr/include/eigen2/Eigen/src/Core/MatrixBase.h
+ /usr/include/eigen2/Eigen/src/Core/MatrixStorage.h
+ /usr/include/eigen2/Eigen/src/Core/Minor.h
+ /usr/include/eigen2/Eigen/src/Core/NestByValue.h
+ /usr/include/eigen2/Eigen/src/Core/NumTraits.h
+ /usr/include/eigen2/Eigen/src/Core/Part.h
+ /usr/include/eigen2/Eigen/src/Core/Product.h
+ /usr/include/eigen2/Eigen/src/Core/Redux.h
+ /usr/include/eigen2/Eigen/src/Core/SolveTriangular.h
+ /usr/include/eigen2/Eigen/src/Core/Sum.h
+ /usr/include/eigen2/Eigen/src/Core/Swap.h
+ /usr/include/eigen2/Eigen/src/Core/Transpose.h
+ /usr/include/eigen2/Eigen/src/Core/Visitor.h
+ /usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
+ /usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
+ /usr/include/eigen2/Eigen/src/Core/util/Constants.h
+ /usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
+ /usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
+ /usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h
+ /usr/include/eigen2/Eigen/src/Core/util/Macros.h
+ /usr/include/eigen2/Eigen/src/Core/util/Memory.h
+ /usr/include/eigen2/Eigen/src/Core/util/Meta.h
+ /usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h
+ /usr/include/eigen2/Eigen/src/Core/util/XprHelper.h
+ /usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h
+ /usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h
+ /usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h
+ /usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h
+ /usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h
+ /usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
+ /usr/include/eigen2/Eigen/src/Geometry/Quaternion.h
+ /usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h
+ /usr/include/eigen2/Eigen/src/Geometry/RotationBase.h
+ /usr/include/eigen2/Eigen/src/Geometry/Scaling.h
+ /usr/include/eigen2/Eigen/src/Geometry/Transform.h
+ /usr/include/eigen2/Eigen/src/Geometry/Translation.h
+ /usr/include/eigen2/Eigen/src/LU/Determinant.h
+ /usr/include/eigen2/Eigen/src/LU/Inverse.h
+ /usr/include/eigen2/Eigen/src/LU/LU.h
+ /usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
+ /usr/include/eigen2/Eigen/src/QR/EigenSolver.h
+ /usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
+ /usr/include/eigen2/Eigen/src/QR/QR.h
+ /usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
+ /usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h
+ /usr/include/eigen2/Eigen/src/SVD/SVD.h
+ /usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h
+ /usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h
+ /usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h
+ /usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h
+ /usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
+ /usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
+ /usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseDot.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseLU.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h
+ /usr/include/eigen2/Eigen/src/Sparse/SparseVector.h
+ /usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
+ /usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h
+ /usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h
+ /usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
)
blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
--- source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
+++ source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
@@ -50,7 +50,7 @@
if(WITH_IK_ITASC)
add_definitions(-DWITH_IK_ITASC)
list(APPEND INC
- ../../../extern/Eigen2
+ /usr/include/eigen2
../../../intern/itasc
)
list(APPEND SRC
--- source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
+++ source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
@@ -51,7 +51,7 @@
../../blender/makesrna
../../blender/windowmanager
../../../extern/bullet2/src
- ../../../extern/Eigen2
+ /usr/include/eigen2
../../../intern/container
../../../intern/guardedalloc
../../../intern/moto/include
|
GitWeb