forked from bartvdbraak/blender
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.
This commit is contained in:
parent
675076a06e
commit
3d903ee3ff
5
extern/colamd/CMakeLists.txt
vendored
5
extern/colamd/CMakeLists.txt
vendored
@ -23,7 +23,7 @@
|
||||
# ***** END GPL LICENSE BLOCK *****
|
||||
|
||||
set(INC
|
||||
Include
|
||||
./Include
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
@ -34,8 +34,7 @@ set(SRC
|
||||
Source/colamd.c
|
||||
Source/colamd_global.c
|
||||
|
||||
Include/colamd.h
|
||||
Include/UFconfig.h
|
||||
Include//colamd.h
|
||||
)
|
||||
|
||||
blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
@ -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}")
|
||||
|
@ -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] )
|
||||
|
||||
|
@ -57,8 +57,4 @@ if(WITH_IK_ITASC)
|
||||
)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
@ -8,7 +8,4 @@ incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
|
||||
|
||||
defs.append('WITH_IK_ITASC')
|
||||
|
||||
if env['PLATFORM'] == 'win32':
|
||||
defs.append('EIGEN_DONT_ALIGN_STATICALLY')
|
||||
|
||||
env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), defs, libtype=['core','player'], priority=[180, 190] )
|
||||
|
Loading…
Reference in New Issue
Block a user