Revision: 37485
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37485
Author: nazgul
Date: 2011-06-14 18:59:36 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Camera tracking integration
===========================
Fixed compilation issues with 32bit windows platforms.
Error was cause by alignment issues. It's known bug in Eigen community
which is caused by weirdeness of msvc compiler.
Disabling static alignment is the simpliest workaround,
but it could make things a bit slover.
Modified Paths:
--------------
branches/soc-2011-tomato/intern/itasc/CMakeLists.txt
branches/soc-2011-tomato/intern/itasc/SConscript
branches/soc-2011-tomato/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-tomato/source/blender/ikplugin/SConscript
Modified: branches/soc-2011-tomato/intern/itasc/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/itasc/CMakeLists.txt 2011-06-14
17:48:42 UTC (rev 37484)
+++ branches/soc-2011-tomato/intern/itasc/CMakeLists.txt 2011-06-14
18:59:36 UTC (rev 37485)
@@ -314,4 +314,8 @@
../../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}")
Modified: branches/soc-2011-tomato/intern/itasc/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/itasc/SConscript 2011-06-14 17:48:42 UTC
(rev 37484)
+++ branches/soc-2011-tomato/intern/itasc/SConscript 2011-06-14 18:59:36 UTC
(rev 37485)
@@ -7,5 +7,10 @@
incs = '. ../../extern/Eigen3'
-env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [],
libtype=['intern','player'], priority=[20,100] )
+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] )
+
Modified: branches/soc-2011-tomato/source/blender/ikplugin/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/ikplugin/CMakeLists.txt
2011-06-14 17:48:42 UTC (rev 37484)
+++ branches/soc-2011-tomato/source/blender/ikplugin/CMakeLists.txt
2011-06-14 18:59:36 UTC (rev 37485)
@@ -58,4 +58,8 @@
)
endif()
+if(WIN32)
+ add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
+endif()
+
blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/source/blender/ikplugin/SConscript
===================================================================
--- branches/soc-2011-tomato/source/blender/ikplugin/SConscript 2011-06-14
17:48:42 UTC (rev 37484)
+++ branches/soc-2011-tomato/source/blender/ikplugin/SConscript 2011-06-14
18:59:36 UTC (rev 37485)
@@ -8,4 +8,7 @@
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] )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
