diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-25 16:37:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-25 16:37:42 +0400 |
| commit | 3d903ee3ffcc5628adfe3dba44bdb314d6646022 (patch) | |
| tree | faa73df437ee7b1e4ef4a97a6e45dde49416552a /intern/itasc | |
| parent | 675076a06ef38f7e565f4867b61564431803dc8b (diff) | |
Libraries upgrade:
- Upgrade Eigen2 library to Eigen3
- Upgrade colamd library and placed in extern/ so other libraries from extern/ can use it
NOTE: With previous version of Eigen (3.0.1) it was necessary to define
EIGEN_DONT_ALIGN_STATICALLY macro to make it compilable on windows 32bit.
After latest upgrade it seems to be unnecessary (at least when was testing libmv),
so i removed that defines which can reduce speed and lead to other problems.
Diffstat (limited to 'intern/itasc')
| -rw-r--r-- | intern/itasc/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | intern/itasc/SConscript | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 3d24a0cb8c6..88ba8e6b8a8 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -46,8 +46,6 @@ set(SRC WSDLSSolver.cpp WorldObject.cpp eigen_types.cpp - ublas_types.hpp - kdl/chain.cpp kdl/chainfksolverpos_recursive.cpp kdl/chainjnttojacsolver.cpp @@ -115,10 +113,7 @@ set(SRC kdl/utilities/traits.h kdl/utilities/utility.h kdl/utilities/utility_io.h - - kdl/frameacc.inl - kdl/frames.inl - kdl/framevel.inl + ublas_types.hpp # until we have another user... ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h @@ -318,8 +313,4 @@ set(SRC ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h ) -if(WIN32) - add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY) -endif() - blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript index 69dddf40228..c1ad931c665 100644 --- a/intern/itasc/SConscript +++ b/intern/itasc/SConscript @@ -9,8 +9,5 @@ incs = '. ../../extern/Eigen3' defs = [] -if env['PLATFORM'] == 'win32': - defs.append('EIGEN_DONT_ALIGN_STATICALLY') - env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100] ) |