kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for cycles building with assertions on scons/windows.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-06-25 11:42:58 +00:00
parent 158a70c8a3
commit 2b41b6d669
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/SConscript
View File

@ -14,7 +14,7 @@ sources.remove(path.join('kernel', 'kernel_optimized.cpp'))
incs = [] incs = []
defs = [] defs = []
cxxflags = [] cxxflags = Split(env['CXXFLAGS'])
defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {') defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
defs.append('CCL_NAMESPACE_END=}') defs.append('CCL_NAMESPACE_END=}')
@ -58,9 +58,9 @@ if env['WITH_BF_RAYOPTIMIZATION']:
optim_sources = [path.join('kernel', 'kernel_optimized.cpp')] optim_sources = [path.join('kernel', 'kernel_optimized.cpp')]
cycles_optim = cycles.Clone() 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 # cuda kernel binaries
if env['WITH_BF_CYCLES_CUDA_BINARIES']: if env['WITH_BF_CYCLES_CUDA_BINARIES']: