diff options
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index b399844534d..15a02881ec2 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -62,12 +62,23 @@ if env['WITH_BF_CYCLES_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') + incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split()) incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna #source/blender/blenlib'.split()) incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split()) incs.append(env['BF_GLEW_INC']) incs.append('#/intern/glew-mx') +incs.append('#/intern/atomic') incs.append('#intern/mikktspace') incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace'.split()) |