Revision: 41283
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41283
Author: nazgul
Date: 2011-10-25 18:13:12 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
Fix compilation error for win32.
That static align trick i've wrote about is still necessary.
Modified Paths:
--------------
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/intern/itasc/SConscript
trunk/blender/source/blender/ikplugin/CMakeLists.txt
trunk/blender/source/blender/ikplugin/SConscript
Modified: trunk/blender/intern/itasc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/itasc/CMakeLists.txt 2011-10-25 16:17:26 UTC (rev
41282)
+++ trunk/blender/intern/itasc/CMakeLists.txt 2011-10-25 18:13:12 UTC (rev
41283)
@@ -318,4 +318,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: trunk/blender/intern/itasc/SConscript
===================================================================
--- trunk/blender/intern/itasc/SConscript 2011-10-25 16:17:26 UTC (rev
41282)
+++ trunk/blender/intern/itasc/SConscript 2011-10-25 18:13:12 UTC (rev
41283)
@@ -9,5 +9,8 @@
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: trunk/blender/source/blender/ikplugin/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/ikplugin/CMakeLists.txt 2011-10-25
16:17:26 UTC (rev 41282)
+++ trunk/blender/source/blender/ikplugin/CMakeLists.txt 2011-10-25
18:13:12 UTC (rev 41283)
@@ -57,4 +57,8 @@
)
endif()
+if(WIN32)
+ add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
+endif()
+
blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/ikplugin/SConscript
===================================================================
--- trunk/blender/source/blender/ikplugin/SConscript 2011-10-25 16:17:26 UTC
(rev 41282)
+++ trunk/blender/source/blender/ikplugin/SConscript 2011-10-25 18:13:12 UTC
(rev 41283)
@@ -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
