diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-03 21:04:57 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-03 21:04:57 +0300 |
| commit | 0762451e86b47ce1851f9198b1ec980e6092ace9 (patch) | |
| tree | 59f381ef96c1d06959b5cc6567286f3c51adaa55 /intern/cycles/kernel | |
| parent | 9ae458362aefc84751b102794dd426f432fb60a6 (diff) | |
Cycles: Synchronize SCons with CMake in regard of logging
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/osl/SConscript | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript index 723ab26b9b3..0a21d3e6819 100644 --- a/intern/cycles/kernel/osl/SConscript +++ b/intern/cycles/kernel/osl/SConscript @@ -47,6 +47,16 @@ defs.append('WITH_OSL') if env['WITH_BF_CYCLES_DEBUG']: defs.append('WITH_CYCLES_DEBUG') +if env['WITH_BF_CYCLES_LOGGING']: + defs.append('WITH_CYCLES_LOGGING') + defs.append('GOOGLE_GLOG_DLL_DECL=') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): + incs.append('#extern/libmv/third_party/glog/src/windows') + incs.append('#extern/libmv/third_party/gflags') + else: + incs.append('#extern/libmv/third_party/glog/src') + incs.append('#extern/libmv/third_party/gflags') + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID /fp:fast'.split()) incs.append(env['BF_PTHREADS_INC']) |