Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-10-25 22:13:12 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-10-25 22:13:12 +0400
commitfe6ad3606090b8fd07dd3493c6dae80f6224fcc3 (patch)
tree2605d91e293834ce0ec394a635edbb7da82d928b /source/blender/ikplugin
parent12f876dcd103bf444d5645c1a08d534112a34daf (diff)
Fix compilation error for win32.
That static align trick i've wrote about is still necessary.
Diffstat (limited to 'source/blender/ikplugin')
-rw-r--r--source/blender/ikplugin/CMakeLists.txt4
-rw-r--r--source/blender/ikplugin/SConscript3
2 files changed, 7 insertions, 0 deletions
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] )