[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37486] branches/soc-2011-salad: Merging r37483 through r37485 from soc-2011-tomato into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Tue Jun 14 21:00:52 CEST 2011
Revision: 37486
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37486
Author: nazgul
Date: 2011-06-14 19:00:52 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Merging r37483 through r37485 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37483
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37485
Modified Paths:
--------------
branches/soc-2011-salad/intern/itasc/CMakeLists.txt
branches/soc-2011-salad/intern/itasc/SConscript
branches/soc-2011-salad/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-salad/source/blender/ikplugin/SConscript
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37482
/trunk/blender:36834-37480
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37485
/trunk/blender:36834-37480
Modified: branches/soc-2011-salad/intern/itasc/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/intern/itasc/CMakeLists.txt 2011-06-14 18:59:36 UTC (rev 37485)
+++ branches/soc-2011-salad/intern/itasc/CMakeLists.txt 2011-06-14 19:00:52 UTC (rev 37486)
@@ -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-salad/intern/itasc/SConscript
===================================================================
--- branches/soc-2011-salad/intern/itasc/SConscript 2011-06-14 18:59:36 UTC (rev 37485)
+++ branches/soc-2011-salad/intern/itasc/SConscript 2011-06-14 19:00:52 UTC (rev 37486)
@@ -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-salad/source/blender/ikplugin/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/source/blender/ikplugin/CMakeLists.txt 2011-06-14 18:59:36 UTC (rev 37485)
+++ branches/soc-2011-salad/source/blender/ikplugin/CMakeLists.txt 2011-06-14 19:00:52 UTC (rev 37486)
@@ -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-salad/source/blender/ikplugin/SConscript
===================================================================
--- branches/soc-2011-salad/source/blender/ikplugin/SConscript 2011-06-14 18:59:36 UTC (rev 37485)
+++ branches/soc-2011-salad/source/blender/ikplugin/SConscript 2011-06-14 19:00:52 UTC (rev 37486)
@@ -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] )
More information about the Bf-blender-cvs
mailing list