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>2013-02-22 14:06:54 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-02-22 14:06:54 +0400
commit4cf9034f6d59840f8312094c184b9708a251fe0a (patch)
tree9334e014603aba0fc29beabcc2b21d788c616634 /extern/libmv/SConscript
parent9b5b9e7a09d984f0b058a49f39cb5c6fe9d37cc6 (diff)
Remove extern_ssba workaround
SSBA seemed to be working OK last time i've checked it with MSVC and optimization enabled. Also, we'll likely replace it with own BA soon, which works fine with MSVC anyway.
Diffstat (limited to 'extern/libmv/SConscript')
-rw-r--r--extern/libmv/SConscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index a0ab5bd61d7..8fd8c566e4d 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -22,6 +22,9 @@ src += env.Glob('libmv/simple_pipeline/*.cc')
src += env.Glob('libmv/tracking/*.cc')
src += env.Glob('third_party/fast/*.c')
src += env.Glob('third_party/gflags/*.cc')
+src += env.Glob('third_party/ldl/Source/*.c')
+src += env.Glob('third_party/ssba/Geometry/*.cpp')
+src += env.Glob('third_party/ssba/Math/*.cpp')
incs = '. ../Eigen3 third_party/ceres/include'
incs += ' ' + env['BF_PNG_INC']
@@ -38,7 +41,7 @@ else:
src += env.Glob("third_party/glog/src/*.cc")
incs += ' ./third_party/glog/src'
-incs += ' ./third_party/ssba ../colamd/Include'
+incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )