Merging r38433 through r38453 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / ikplugin / CMakeLists.txt
index dc637aedd6db3e79a8aca014ba5d9dd9dc4dc1e7..d40a87b4e03f0ea718ca60d499570986021f525e 100644 (file)
@@ -50,7 +50,7 @@ set(SRC
 if(WITH_IK_ITASC)
        add_definitions(-DWITH_IK_ITASC)
        list(APPEND INC
-               ../../../extern/Eigen2
+               ../../../extern/Eigen3
                ../../../intern/itasc
        )
        list(APPEND SRC
@@ -58,4 +58,8 @@ if(WITH_IK_ITASC)
        )
 endif()
 
+if(WIN32)
+       add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
+endif()
+
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")