diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-01-29 16:29:06 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-01-29 16:29:24 +0400 |
| commit | ac27a1a0f68a0c8d274998d470b3f4ebc393e9e3 (patch) | |
| tree | 9a41c332fee16793755d7ff97b3b2e850a0c80cd /intern/cycles/SConscript | |
| parent | bc08cf58576d29862fc167927d79285217d9948b (diff) | |
Scons: Some tweaks for f70d9660474c, we don't need SSE41 kernel for 32bit, nor vc2008 x64.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 3b7ca7d3b8f..e05ecf40496 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -83,15 +83,14 @@ if env['OURPLATFORM'] == 'win32-vc': # there is no /arch:SSE3, but intrinsics are available anyway kernel_flags['sse2'] = '/arch:SSE /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /Gs-' kernel_flags['sse3'] = kernel_flags['sse2'] - kernel_flags['sse41'] = kernel_flags['sse3'] elif env['OURPLATFORM'] == 'win64-vc': # /arch:AVX only available from visual studio 2012 kernel_flags['sse2'] = '-D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /Gs-' kernel_flags['sse3'] = kernel_flags['sse2'] - kernel_flags['sse41'] = kernel_flags['sse3'] if env['MSVC_VERSION'] in {'11.0', '12.0'}: + kernel_flags['sse41'] = kernel_flags['sse3'] kernel_flags['avx'] = kernel_flags['sse41'] + ' /arch:AVX' else: # -mavx only available with relatively new gcc/clang |