forked from bartvdbraak/blender
SCons: Don't compile libmv stub when libmv is actually enabled
Really weird linux and windows didn't have duplicated symbols error.
This commit is contained in:
parent
4832538ad0
commit
58a9569628
1
extern/libmv/SConscript
vendored
1
extern/libmv/SConscript
vendored
@ -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
1
extern/libmv/bundle.sh
vendored
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user