diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-10 03:18:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-10 03:58:06 +0300 |
| commit | 858b680a50888a071d5d37af261b0c89b47aea8c (patch) | |
| tree | 83de3b9a40e71fda39015a239a2b93e54c11b357 /source | |
| parent | 14f2ae4bbc58f051db97ea96f78d39a6d7dae527 (diff) | |
Eigen: move C API into intern/eigen.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/math_solvers.c | 2 | ||||
| -rw-r--r-- | source/blender/physics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 45b41a4a098..944ba60eb58 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -29,13 +29,13 @@ set(INC ../makesdna ../../../intern/guardedalloc ../../../intern/atomic + ../../../intern/eigen ../../../extern/wcwidth ) set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} - ../../../extern/Eigen3 ) set(SRC diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 0e4b9bf4efd..5f92741fde2 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -34,9 +34,9 @@ cflags='' incs = [ '.', '#/extern/wcwidth', - '#/extern/Eigen3', '#/intern/guardedalloc', '#/intern/atomic', + '#/intern/eigen', '../makesdna', env['BF_FREETYPE_INC'], env['BF_ZLIB_INC'], diff --git a/source/blender/blenlib/intern/math_solvers.c b/source/blender/blenlib/intern/math_solvers.c index d1dad9a6269..c27c6bea160 100644 --- a/source/blender/blenlib/intern/math_solvers.c +++ b/source/blender/blenlib/intern/math_solvers.c @@ -34,7 +34,7 @@ #include "BLI_strict_flags.h" -#include "eigen3_capi.h" +#include "eigen_capi.h" /********************************** Eigen Solvers *********************************/ diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt index 855449ca0f3..0a4ff3fe0f0 100644 --- a/source/blender/physics/CMakeLists.txt +++ b/source/blender/physics/CMakeLists.txt @@ -34,7 +34,7 @@ set(INC ) set(INC_SYS - ../../../extern/Eigen3 + ${EIGEN3_INCLUDE_DIRS} ) set(SRC diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 11055ab77bd..f3a65c4d75e 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -171,12 +171,12 @@ endif() bf_intern_opencolorio bf_intern_opennl bf_intern_glew_mx + bf_intern_eigen extern_rangetree extern_wcwidth extern_libmv extern_glog extern_sdlew - extern_eigen3 ) if(WITH_MOD_CLOTH_ELTOPO) |