Fix compilation error for win32.
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 25 Oct 2011 18:13:12 +0000 (18:13 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 25 Oct 2011 18:13:12 +0000 (18:13 +0000)
That static align trick i've wrote about is still necessary.

intern/itasc/CMakeLists.txt
intern/itasc/SConscript
source/blender/ikplugin/CMakeLists.txt
source/blender/ikplugin/SConscript

index 5907507..3d24a0c 100644 (file)
@@ -318,4 +318,8 @@ set(SRC
        ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
 )
 
        ../../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}")
 blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
index c1ad931..69dddf4 100644 (file)
@@ -9,5 +9,8 @@ incs = '. ../../extern/Eigen3'
 
 defs = []
 
 
 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] )
 
 env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100] )
 
index 518fc9a..87b0c6c 100644 (file)
@@ -57,4 +57,8 @@ if(WITH_IK_ITASC)
        )
 endif()
 
        )
 endif()
 
+if(WIN32)
+       add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
+endif()
+
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
index 38c5389..4cff339 100644 (file)
@@ -8,4 +8,7 @@ incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
 
 defs.append('WITH_IK_ITASC')
 
 
 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] )
 env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), defs, libtype=['core','player'], priority=[180, 190] )