Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2014-01-07 00:38:51 +0400
committerMartijn Berger <martijn.berger@gmail.com>2014-01-07 00:38:56 +0400
commit62c8bae872b7081eb71a0be3d55df91a672b95e7 (patch)
tree33fa88168396881c90f73c66a6423949920f52d8 /intern/cycles/SConscript
parent5022d9f81b094da8520809daeb721978707b6cfc (diff)
Added scons option to actually build the sse41 kernel. CMake already has it
Diffstat (limited to 'intern/cycles/SConscript')
-rw-r--r--intern/cycles/SConscript9
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index eeb60f37f92..448375a04ff 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -97,10 +97,11 @@ if env['WITH_BF_RAYOPTIMIZATION']:
defs.append('WITH_OPTIMIZED_KERNEL')
optim_defs = defs[:]
- # Disabled sse4+ patchs for now
- #cycles_sse41 = cycles.Clone()
- #sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')]
- #cycles_sse41.BlenderLib('bf_intern_cycles_sse41', sse41_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=sse41_cxxflags)
+ if env['WITH_CYCLES_OPTIMIZED_KERNEL_SSE41']:
+ cycles_sse41 = cycles.Clone()
+ sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')]
+ cycles_sse41.BlenderLib('bf_intern_cycles_sse41', sse41_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=sse41_cxxflags)
+ defs.append('WITH_CYCLES_OPTIMIZED_KERNEL_SSE41')
cycles_sse3 = cycles.Clone()
sse3_sources = [path.join('kernel', 'kernel_sse3.cpp')]