[Bf-blender-cvs] [afbc45e] master: Cycles: Attempt to fix osl+scons compilation

[Sergey Sharybin]

Commit: afbc45ed93c22afcffd4f3aa2078a4e324263045
Author: Sergey Sharybin
Date:   Mon Mar 30 13:55:45 2015 +0500
Branches: master
https://developer.blender.org/rBafbc45ed93c22afcffd4f3aa2078a4e324263045

Cycles: Attempt to fix osl+scons compilation

Defines (and other cflags) are not inherited by scons to the subdirectories,
need to take care of them in all nested SConscripts.

===================================================================

M	intern/cycles/kernel/osl/SConscript

===================================================================

diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript
index 58b0204..74ba5e1 100644
--- a/intern/cycles/kernel/osl/SConscript
+++ b/intern/cycles/kernel/osl/SConscript
@@ -44,6 +44,18 @@ defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
 defs.append('CCL_NAMESPACE_END=}')
 defs.append('WITH_OSL')
 
+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')
+
 if env['WITH_BF_CYCLES_DEBUG']:
     defs.append('WITH_CYCLES_DEBUG')