diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:01:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:08 +0300 |
| commit | e9596e5deff93364a0fe588f8e8e408fcbcc2b96 (patch) | |
| tree | 25d2a149aa9c6b77679e81337086a34a616a50b8 /intern/cycles/SConscript | |
| parent | b8fc4fe5aa542064c44db3476c8d8911bf674f01 (diff) | |
Cycles: Post-reintegration tweaks to ensure things do compile
This commit contains all the tweaks which were missing in initial patch
re-integration from the standalone Cycles repository.
This commit also contains an utility cmake macro to help linking targets
with different libraries for release/debug builds, the name currently is
target_link_libraries_decoupled
it gets a target and list of libraries and makes sure debug builds are
using libraries with "_d" suffix.
After all this changes it'll hopefully be easier to interchange patches
between blender and standalone repositories, because they're now quite
identical.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index fd7ac974ab0..9cbdb93ce85 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -65,7 +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') + defs.append('CYCLES_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') |