diff options
| -rw-r--r-- | intern/itasc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/itasc/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/ikplugin/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/ikplugin/SConscript | 3 |
4 files changed, 14 insertions, 0 deletions
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 59075079654..3d24a0cb8c6 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -318,4 +318,8 @@ 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 c1ad931c665..69dddf40228 100644 --- a/intern/itasc/SConscript +++ b/intern/itasc/SConscript @@ -9,5 +9,8 @@ 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] ) diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 518fc9a99ea..87b0c6c671a 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -57,4 +57,8 @@ if(WITH_IK_ITASC) ) endif() +if(WIN32) + add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY) +endif() + blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript index 38c53894df8..4cff3399fdc 100644 --- a/source/blender/ikplugin/SConscript +++ b/source/blender/ikplugin/SConscript @@ -8,4 +8,7 @@ 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] ) |