diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-12 14:01:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:08 +0300 |
| commit | 93ca68b50c9112748366de4573f6554b7368d7cc (patch) | |
| tree | a36a68066cfe5c8b94ea71be2d475bb4bd1d5337 /intern/cycles/SConscript | |
| parent | 405c0fddb47b766a1a16af3cd3dab9387f17d43d (diff) | |
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.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
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') |