From 93ca68b50c9112748366de4573f6554b7368d7cc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 12 Dec 2014 16:01:30 +0500 Subject: Cycles: Be ready for gflags namespace auto-detect This way it is now possible to use gflags >= 2.1, where all the functions were moved from google to gflags namespace. This isn't currently used in blender, but for standalone repository this change is essential. --- intern/cycles/SConscript | 1 + 1 file changed, 1 insertion(+) (limited to 'intern/cycles/SConscript') diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 15a02881ec2..fd7ac974ab0 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -65,6 +65,7 @@ if env['WITH_BF_CYCLES_DEBUG']: if env['WITH_BF_CYCLES_LOGGING']: defs.append('WITH_CYCLES_LOGGING') defs.append('GOOGLE_GLOG_DLL_DECL=') + defs.append('GFLAGS_NAMESPACE=gflags') 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') -- cgit v1.2.3