diff options
Diffstat (limited to 'extern/libmv/SConscript')
| -rw-r--r-- | extern/libmv/SConscript | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index 162fb88df53..251e5835d64 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -6,13 +6,28 @@ import sys import os -from FindSharedPtr import FindSharedPtr Import('env') defs = [] incs = '.' +if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']): + defs.append('GOOGLE_GLOG_DLL_DECL=') + defs.append('WITH_LIBMV_GUARDED_ALLOC') + defs.append('LIBMV_NO_FAST_DETECTOR') + + incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc' + incs += ' ' + env['BF_PNG_INC'] + incs += ' ' + env['BF_ZLIB_INC'] + + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): + incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): + incs += ' ./third_party/msinttypes' + else: + incs += ' ./third_party/glog/src' + if env['WITH_BF_LIBMV']: if not env['WITH_SHARED_PTR_SUPPORT']: print("-- Unable to find shared_ptr which is required for compilation.") @@ -23,40 +38,33 @@ if env['WITH_BF_LIBMV']: if env['SHARED_PTR_NAMESPACE'] == 'std::tr1': defs.append('CERES_TR1_SHARED_PTR') - defs.append('GOOGLE_GLOG_DLL_DECL=') - defs.append('WITH_LIBMV_GUARDED_ALLOC') - defs.append('LIBMV_NO_FAST_DETECTOR') - src = env.Glob('intern/*.cc') src.remove('intern' + os.sep + 'stub.cc') + src += env.Glob('libmv/autotrack/*.cc') src += env.Glob('libmv/base/*.cc') src += env.Glob('libmv/image/*.cc') src += env.Glob('libmv/multiview/*.cc') src += env.Glob('libmv/numeric/*.cc') src += env.Glob('libmv/simple_pipeline/*.cc') src += env.Glob('libmv/tracking/*.cc') - src += env.Glob('third_party/gflags/*.cc') - - incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc' - incs += ' ' + env['BF_PNG_INC'] - incs += ' ' + env['BF_ZLIB_INC'] - - if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): - incs += ' ./third_party/msinttypes' - - src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc'] - src += ['./third_party/glog/src/windows/port.cc'] - else: - src += env.Glob("third_party/glog/src/*.cc") - incs += ' ./third_party/glog/src' else: src = env.Glob("intern/stub.cc") src = [src for src in src if src.find('_test.cc') == -1] -env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] ) +env.BlenderLib(libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137]) + +if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']): + glog_src = [] + glog_src += env.Glob("third_party/gflags/*.cc") + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): + glog_src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc'] + glog_src += ['./third_party/glog/src/windows/port.cc'] + else: + glog_src.remove('third_party/gflags/windows_port.cc') + glog_src += env.Glob("third_party/glog/src/*.cc") + + env.BlenderLib(libname = 'extern_glog', sources=glog_src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137]) if env['WITH_BF_LIBMV']: SConscript(['third_party/SConscript']) |