[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48267] trunk/blender/intern/cycles/ SConscript: Fix for cycles building with assertions on scons/windows.

[Brecht Van Lommel]

Revision: 48267
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48267
Author:   blendix
Date:     2012-06-25 11:42:58 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Fix for cycles building with assertions on scons/windows.

Modified Paths:
--------------
    trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2012-06-25 11:19:38 UTC (rev 48266)
+++ trunk/blender/intern/cycles/SConscript	2012-06-25 11:42:58 UTC (rev 48267)
@@ -14,7 +14,7 @@
 
 incs = [] 
 defs = []
-cxxflags = []
+cxxflags = Split(env['CXXFLAGS'])
 
 defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
 defs.append('CCL_NAMESPACE_END=}')
@@ -58,9 +58,9 @@
     optim_sources = [path.join('kernel', 'kernel_optimized.cpp')]
 
     cycles_optim = cycles.Clone()
-    cycles_optim.BlenderLib('bf_intern_cycles_optimized', optim_sources, incs, optim_defs, libtype=['intern'], priority=[10], compileflags=[None], cxx_compileflags=optim_cxxflags)
+    cycles_optim.BlenderLib('bf_intern_cycles_optimized', optim_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=optim_cxxflags)
 
-cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'], priority=[0], compileflags=[None], cxx_compileflags=cxxflags)
+cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'], priority=[0], cxx_compileflags=cxxflags)
 
 # cuda kernel binaries
 if env['WITH_BF_CYCLES_CUDA_BINARIES']: