diff options
author | Thomas Dinges <blender@dingto.org> | 2012-05-28 13:20:04 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-05-28 13:20:04 +0400 |
commit | 04c30c5efbddba0266f0f593fcb87683af2af5a8 (patch) | |
tree | 23be5c516f74047919a150a0b68e35552fd6d936 | |
parent | 3a190396dd8b631b6f33a9b1d142cb8a9275001e (diff) |
Scons / MSVC - Windows x64
* SSE/SSE2 is an unknown option for the compiler (Command line warning D9002 : ignoring unknown option '/arch:SSE2'), so it can be left out because on x64 it automatically builds with SSE and SSE2.
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 3 | ||||
-rw-r--r-- | intern/cycles/SConscript | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 3a376be6024..9e36be42329 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -166,7 +166,8 @@ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21'] #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True -BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2'] +# No need to manually specify SSE/SSE2 on x64 systems. +BF_RAYOPTIMIZATION_SSE_FLAGS = [''] WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 34c6e8df2fd..03880bddd8a 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -46,8 +46,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', ' if env['WITH_BF_RAYOPTIMIZATION']: optim_cxxflags = [] - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): + if env['OURPLATFORM'] == 'win32-vc': optim_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split()) + elif env['OURPLATFORM'] == 'win64-vc': + optim_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split()) else: optim_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mfpmath=sse'.split()) |