From 2b41b6d669fa6fc62b20785adba9fb60f000e63e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 25 Jun 2012 11:42:58 +0000 Subject: [PATCH] Fix for cycles building with assertions on scons/windows. --- intern/cycles/SConscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 03880bddd8a..a7b8637e3ad 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -14,7 +14,7 @@ sources.remove(path.join('kernel', 'kernel_optimized.cpp')) incs = [] defs = [] -cxxflags = [] +cxxflags = Split(env['CXXFLAGS']) defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {') defs.append('CCL_NAMESPACE_END=}') @@ -58,9 +58,9 @@ if env['WITH_BF_RAYOPTIMIZATION']: 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']: