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 /intern/itasc
parent12f876dcd103bf444d5645c1a08d534112a34daf (diff)
Fix compilation error for win32.
That static align trick i've wrote about is still necessary.
Diffstat (limited to 'intern/itasc')
-rw-r--r--intern/itasc/CMakeLists.txt4
-rw-r--r--intern/itasc/SConscript3
2 files changed, 7 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] )