[Bf-blender-cvs] [0762451] master: Cycles: Synchronize SCons with CMake in regard of logging

[Sergey Sharybin]

Commit: 0762451e86b47ce1851f9198b1ec980e6092ace9
Author: Sergey Sharybin
Date:   Wed Dec 3 23:04:57 2014 +0500
Branches: master
https://developer.blender.org/rB0762451e86b47ce1851f9198b1ec980e6092ace9

Cycles: Synchronize SCons with CMake in regard of logging

===================================================================

M	intern/cycles/kernel/osl/SConscript

===================================================================

diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript
index 723ab26..0a21d3e 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'])