bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

SCons: Don't compile libmv stub when libmv is actually enabled

Browse Source 
Really weird linux and windows didn't have duplicated symbols error.
This commit is contained in:
Sergey Sharybin 2014-09-26 14:28:04 +06:00
parent 4832538ad0
commit 58a9569628
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extern/libmv/SConscript vendored
View File

@ -28,6 +28,7 @@ if env['WITH_BF_LIBMV']:
defs.append('LIBMV_NO_FAST_DETECTOR')
src = env.Glob('intern/*.cc')
src.remove('intern' + os.sep + 'stub.cc')
src += env.Glob('libmv/base/*.cc')
src += env.Glob('libmv/image/*.cc')
src += env.Glob('libmv/multiview/*.cc')

1
extern/libmv/bundle.sh vendored
View File

@ -307,6 +307,7 @@ if env['WITH_BF_LIBMV']:
defs.append('LIBMV_NO_FAST_DETECTOR')
src = env.Glob('intern/*.cc')
src.remove('intern' + os.sep + 'stub.cc')
$src
incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'