diff -Npur blender-2.64a.orig/extern/libmv/bundle.sh blender-2.64a/extern/libmv/bundle.sh --- blender-2.64a.orig/extern/libmv/bundle.sh 2012-11-10 21:39:05.617511575 +0100 +++ blender-2.64a/extern/libmv/bundle.sh 2012-11-10 21:44:50.047608646 +0100 @@ -124,7 +124,6 @@ cat > CMakeLists.txt << EOF set(INC . - ../Eigen3 third_party/ssba third_party/ldl/Include ../colamd/Include @@ -132,6 +131,7 @@ set(INC ) set(INC_SYS + /usr/include/eigen3 \${PNG_INCLUDE_DIR} \${ZLIB_INCLUDE_DIRS} ) @@ -251,7 +251,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=') src = env.Glob("*.cpp") $src -incs = '. ../Eigen3 third_party/ceres/include' +incs = '. /usr/include/eigen3 third_party/ceres/include' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] diff -Npur blender-2.64a.orig/extern/libmv/CMakeLists.txt blender-2.64a/extern/libmv/CMakeLists.txt --- blender-2.64a.orig/extern/libmv/CMakeLists.txt 2012-11-10 21:38:48.753486064 +0100 +++ blender-2.64a/extern/libmv/CMakeLists.txt 2012-11-10 21:45:59.360603387 +0100 @@ -28,7 +28,6 @@ set(INC . - ../Eigen3 third_party/ssba third_party/ldl/Include ../colamd/Include @@ -36,6 +35,7 @@ set(INC ) set(INC_SYS + /usr/include/eigen3 ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) diff -Npur blender-2.64a.orig/extern/libmv/SConscript blender-2.64a/extern/libmv/SConscript --- blender-2.64a.orig/extern/libmv/SConscript 2012-11-10 21:39:16.593877306 +0100 +++ blender-2.64a/extern/libmv/SConscript 2012-11-10 21:46:46.065904517 +0100 @@ -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 third_party/ceres/include' +incs = '. /usr/include/eigen3 third_party/ceres/include' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] diff -Npur blender-2.64a.orig/extern/libmv/third_party/ceres/bundle.sh blender-2.64a/extern/libmv/third_party/ceres/bundle.sh --- blender-2.64a.orig/extern/libmv/third_party/ceres/bundle.sh 2012-11-11 07:18:18.486209019 +0100 +++ blender-2.64a/extern/libmv/third_party/ceres/bundle.sh 2012-11-11 07:33:27.695747811 +0100 @@ -117,13 +117,13 @@ cat > CMakeLists.txt << EOF set(INC . - ../../../Eigen3 include internal ../gflags ) set(INC_SYS + /usr/include/eigen3 ) set(SRC @@ -215,7 +215,7 @@ defs.append('CERES_RESTRICT_SCHUR_SPECIA if 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']: defs.append('CERES_NO_TR1') -incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' +incs = '. ../../ /usr/include/eigen3 ./include ./internal ../gflags' # work around broken hashtable in 10.5 SDK if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']: diff -Npur blender-2.64a.orig/extern/libmv/third_party/ceres/CMakeLists.txt blender-2.64a/extern/libmv/third_party/ceres/CMakeLists.txt --- blender-2.64a.orig/extern/libmv/third_party/ceres/CMakeLists.txt 2012-11-10 23:06:11.293362182 +0100 +++ blender-2.64a/extern/libmv/third_party/ceres/CMakeLists.txt 2012-11-11 07:43:28.888605116 +0100 @@ -28,13 +28,14 @@ set(INC . - ../../../Eigen3 + ../../ include internal ../gflags ) set(INC_SYS + /usr/include/eigen3 ) set(SRC diff -Npur blender-2.64a.orig/extern/libmv/third_party/ceres/SConscript blender-2.64a/extern/libmv/third_party/ceres/SConscript --- blender-2.64a.orig/extern/libmv/third_party/ceres/SConscript 2012-11-10 23:06:11.294362121 +0100 +++ blender-2.64a/extern/libmv/third_party/ceres/SConscript 2012-11-11 07:40:12.730192463 +0100 @@ -27,7 +27,7 @@ defs.append('CERES_RESTRICT_SCHUR_SPECIA if 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']: defs.append('CERES_NO_TR1') -incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' +incs = '. ../../ /usr/include/eigen3 ./include ./internal ../gflags' # work around broken hashtable in 10.5 SDK if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']: diff -Npur blender-2.64a.orig/intern/dualcon/SConscript blender-2.64a/intern/dualcon/SConscript --- blender-2.64a.orig/intern/dualcon/SConscript 2012-11-10 21:39:37.186687348 +0100 +++ blender-2.64a/intern/dualcon/SConscript 2012-11-10 21:47:16.844125995 +0100 @@ -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] ) diff -Npur blender-2.64a.orig/intern/itasc/CMakeLists.txt blender-2.64a/intern/itasc/CMakeLists.txt --- blender-2.64a.orig/intern/itasc/CMakeLists.txt 2012-11-10 21:39:51.058885740 +0100 +++ blender-2.64a/intern/itasc/CMakeLists.txt 2012-11-10 22:00:18.990929561 +0100 @@ -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/SVD/UpperBidiagonalization.h + /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h + /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h + /usr/include/eigen3/Eigen/src/LU/Inverse.h + /usr/include/eigen3/Eigen/src/LU/Determinant.h + /usr/include/eigen3/Eigen/src/LU/FullPivLU.h + /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h + /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h + /usr/include/eigen3/Eigen/src/Cholesky/LLT.h + /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h + /usr/include/eigen3/Eigen/src/Geometry/Transform.h + /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h + /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h + /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h + /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h + /usr/include/eigen3/Eigen/src/Geometry/Translation.h + /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h + /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h + /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h + /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h + /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h + /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h + /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h + /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h + /usr/include/eigen3/Eigen/src/Geometry/Scaling.h + /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h + /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h + /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h + /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h + /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h + /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h + /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h + /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h + /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h + /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h + /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h + /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h + /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h + /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h + /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h + /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h + /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h + /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h + /usr/include/eigen3/Eigen/src/Sparse/SparseView.h + /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h + /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h + /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h + /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h + /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h + /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h + /usr/include/eigen3/Eigen/src/Householder/Householder.h + /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h + /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h + /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h + /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h + /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h + /usr/include/eigen3/Eigen/src/Core/util/Meta.h + /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.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/Macros.h + /usr/include/eigen3/Eigen/src/Core/util/Constants.h + /usr/include/eigen3/Eigen/src/Core/util/Memory.h + /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h + /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h + /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h + /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h + /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h + /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h + /usr/include/eigen3/Eigen/src/Core/NoAlias.h + /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h + /usr/include/eigen3/Eigen/src/Core/Matrix.h + /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h + /usr/include/eigen3/Eigen/src/Core/Array.h + /usr/include/eigen3/Eigen/src/Core/ArrayBase.h + /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h + /usr/include/eigen3/Eigen/src/Core/Select.h + /usr/include/eigen3/Eigen/src/Core/MapBase.h + /usr/include/eigen3/Eigen/src/Core/NestByValue.h + /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h + /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h + /usr/include/eigen3/Eigen/src/Core/Visitor.h + /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h + /usr/include/eigen3/Eigen/src/Core/Replicate.h + /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h + /usr/include/eigen3/Eigen/src/Core/IO.h + /usr/include/eigen3/Eigen/src/Core/EigenBase.h + /usr/include/eigen3/Eigen/src/Core/MatrixBase.h + /usr/include/eigen3/Eigen/src/Core/Dot.h + /usr/include/eigen3/Eigen/src/Core/Diagonal.h + /usr/include/eigen3/Eigen/src/Core/Transpositions.h + /usr/include/eigen3/Eigen/src/Core/Random.h + /usr/include/eigen3/Eigen/src/Core/DenseStorage.h + /usr/include/eigen3/Eigen/src/Core/Product.h + /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h + /usr/include/eigen3/Eigen/src/Core/Stride.h + /usr/include/eigen3/Eigen/src/Core/Functors.h + /usr/include/eigen3/Eigen/src/Core/Transpose.h + /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h + /usr/include/eigen3/Eigen/src/Core/Flagged.h + /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h + /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h + /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h + /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h + /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h + /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h + /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.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/SelfadjointMatrixMatrix.h + /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h + /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h + /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h + /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h + /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h + /usr/include/eigen3/Eigen/src/Core/Block.h + /usr/include/eigen3/Eigen/src/Core/StableNorm.h + /usr/include/eigen3/Eigen/src/Core/Map.h + /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h + /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h + /usr/include/eigen3/Eigen/src/Core/MathFunctions.h + /usr/include/eigen3/Eigen/src/Core/Fuzzy.h + /usr/include/eigen3/Eigen/src/Core/BandMatrix.h + /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h + /usr/include/eigen3/Eigen/src/Core/Reverse.h + /usr/include/eigen3/Eigen/src/Core/Swap.h + /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h + /usr/include/eigen3/Eigen/src/Core/DenseBase.h + /usr/include/eigen3/Eigen/src/Core/Redux.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/Default/Settings.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/MathFunctions.h + /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h + /usr/include/eigen3/Eigen/src/Core/ProductBase.h + /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h + /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h + /usr/include/eigen3/Eigen/src/Core/VectorBlock.h + /usr/include/eigen3/Eigen/src/Core/NumTraits.h + /usr/include/eigen3/Eigen/src/Core/Assign.h + /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h + /usr/include/eigen3/Eigen/src/StlSupport/StdList.h + /usr/include/eigen3/Eigen/src/StlSupport/details.h + /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h + /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h + /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h + /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h + /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h + /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h + /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h + /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h + /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h + /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h + /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h + /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h + /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h + /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h + /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h + /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h + /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h + /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h + /usr/include/eigen3/Eigen/src/misc/Solve.h + /usr/include/eigen3/Eigen/src/misc/Image.h + /usr/include/eigen3/Eigen/src/misc/Kernel.h + /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h + /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h + /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h + /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h + /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h + /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h + /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h + /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h + /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h + /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h ) diff -Npur blender-2.64a.orig/intern/itasc/SConscript blender-2.64a/intern/itasc/SConscript --- blender-2.64a.orig/intern/itasc/SConscript 2012-11-10 21:39:58.610449373 +0100 +++ blender-2.64a/intern/itasc/SConscript 2012-11-10 22:37:06.271454451 +0100 @@ -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.64a.orig/source/blender/ikplugin/CMakeLists.txt blender-2.64a/source/blender/ikplugin/CMakeLists.txt --- blender-2.64a.orig/source/blender/ikplugin/CMakeLists.txt 2012-11-10 21:40:24.587948260 +0100 +++ blender-2.64a/source/blender/ikplugin/CMakeLists.txt 2012-11-10 22:02:20.425912427 +0100 @@ -56,9 +56,11 @@ endif() 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 intern/itasc_plugin.h diff -Npur blender-2.64a.orig/source/blender/ikplugin/SConscript blender-2.64a/source/blender/ikplugin/SConscript --- blender-2.64a.orig/source/blender/ikplugin/SConscript 2012-11-10 21:40:31.715536392 +0100 +++ blender-2.64a/source/blender/ikplugin/SConscript 2012-11-10 22:03:00.450599596 +0100 @@ -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') defs.append('WITH_IK_SOLVER') diff -Npur blender-2.64a.orig/source/gameengine/Converter/CMakeLists.txt blender-2.64a/source/gameengine/Converter/CMakeLists.txt --- blender-2.64a.orig/source/gameengine/Converter/CMakeLists.txt 2012-11-10 21:40:52.116357528 +0100 +++ blender-2.64a/source/gameengine/Converter/CMakeLists.txt 2012-11-10 22:04:08.805649694 +0100 @@ -50,7 +50,6 @@ set(INC ../../blender/makesrna ../../blender/windowmanager ../../../extern/bullet2/src - ../../../extern/Eigen3 ../../../intern/container ../../../intern/guardedalloc ../../../intern/moto/include @@ -60,6 +59,7 @@ set(INC set(INC_SYS ${PTHREADS_INCLUDE_DIRS} + /usr/include/eigen3 ) diff -Npur blender-2.64a.orig/source/gameengine/Converter/SConscript blender-2.64a/source/gameengine/Converter/SConscript --- blender-2.64a.orig/source/gameengine/Converter/SConscript 2012-11-10 22:09:53.463733591 +0100 +++ blender-2.64a/source/gameengine/Converter/SConscript 2012-11-10 22:06:23.399872153 +0100 @@ -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']