diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2015-03-29 23:12:22 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2015-03-29 23:12:40 +0300 |
| commit | f01456aaa4a87cd76feaef50ec822340197f9eda (patch) | |
| tree | 5e4147b31def6462158b2ecd269df55ea1679c53 /intern/cycles/SConscript | |
| parent | 70d9c013257906d3e894907b92e693d1ccebd7fd (diff) | |
Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though
Reviewers: dingto, sergey
Reviewed By: sergey
Subscribers: #cycles
Differential Revision: https://developer.blender.org/D1185
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 9cbdb93ce85..79e14ab9a58 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -47,6 +47,18 @@ cxxflags = Split(env['CXXFLAGS']) defs += env['BF_GL_DEFINITIONS'] +if env['WITH_UNORDERED_MAP_SUPPORT']: + if env['UNORDERED_MAP_HEADER'] == 'unordered_map': + if env['UNORDERED_MAP_NAMESPACE'] == 'std': + defs.append('CYCLES_STD_UNORDERED_MAP') + elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1': + defs.append('CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE') + elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1': + defs.append('CYCLES_TR1_UNORDERED_MAP') +else: + print("-- Replacing unordered_map/set with map/set (warning: slower!)") + defs.append('CYCLES_NO_UNORDERED_MAP') + defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {') defs.append('CCL_NAMESPACE_END=}') |