diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-03 19:51:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-03 20:46:56 +0300 |
| commit | 627f27502f931c298dd42137c58be51b06a1de36 (patch) | |
| tree | 8ae38b14435068c7e9c29450432cf4aac5315871 /extern | |
| parent | f96fd4430a74e79ac1536f5aff8748a8721cdb8f (diff) | |
Cycles: Support logging when building with SCons
Basically, title says ti all, the option is called WITH_BF_CYCLES_LOGGING
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/SConscript | 15 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 17 |
2 files changed, 23 insertions, 9 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index 96282f3c3c2..c3e6a4b621d 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -46,17 +46,24 @@ if env['WITH_BF_LIBMV']: 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 = [] + 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 += 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']) diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 45b0e27f126..e467cc98371 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -213,7 +213,7 @@ ${tests} endif() else() list(APPEND SRC - libmv-capi_stub.cc + intern/stub.cc ) endif() @@ -321,17 +321,24 @@ $src if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): incs += ' ./third_party/msinttypes' ${win_src} - 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 = [] + 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 += 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']) |