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 16:37:42 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-10-25 16:37:42 +0400
commit3d903ee3ffcc5628adfe3dba44bdb314d6646022 (patch)
treefaa73df437ee7b1e4ef4a97a6e45dde49416552a /source/blender/ikplugin
parent675076a06ef38f7e565f4867b61564431803dc8b (diff)
Libraries upgrade:
- Upgrade Eigen2 library to Eigen3 - Upgrade colamd library and placed in extern/ so other libraries from extern/ can use it NOTE: With previous version of Eigen (3.0.1) it was necessary to define EIGEN_DONT_ALIGN_STATICALLY macro to make it compilable on windows 32bit. After latest upgrade it seems to be unnecessary (at least when was testing libmv), so i removed that defines which can reduce speed and lead to other problems.
Diffstat (limited to 'source/blender/ikplugin')
-rw-r--r--source/blender/ikplugin/CMakeLists.txt4
-rw-r--r--source/blender/ikplugin/SConscript3
2 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 87b0c6c671a..518fc9a99ea 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -57,8 +57,4 @@ if(WITH_IK_ITASC)
)
endif()
-if(WIN32)
- add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
-endif()
-
blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript
index 4cff3399fdc..38c53894df8 100644
--- a/source/blender/ikplugin/SConscript
+++ b/source/blender/ikplugin/SConscript
@@ -8,7 +8,4 @@ incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
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] )