diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-01-15 01:04:32 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-01-15 01:04:32 +0400 |
| commit | 5d88f7c7db7f52d6e403d515deb602920c29d261 (patch) | |
| tree | b97ad1eb66321b32079f020b66383fe03e090bd2 /intern/cycles/SConscript | |
| parent | 839ddfbb6512218fec9247350e87a1c4bb9ac4b8 (diff) | |
Cycles: Build SSE41 kernel per default, remove build option. This hopefully also fixes some compile errors on various systems.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index e31fb5bed96..b1dfeee1560 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -93,14 +93,11 @@ else: sse3_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse'.split()) sse41_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mfpmath=sse'.split()) -defs.append('WITH_OPTIMIZED_KERNEL') optim_defs = defs[:] -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_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) cycles_sse3 = cycles.Clone() sse3_sources = [path.join('kernel', 'kernel_sse3.cpp')] |