Scons / MSVC - Windows x64
authorThomas Dinges <blender@dingto.org>
Mon, 28 May 2012 09:20:04 +0000 (09:20 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 28 May 2012 09:20:04 +0000 (09:20 +0000)
* 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.

build_files/scons/config/win64-vc-config.py
intern/cycles/SConscript

index 3a376be60244da8776abc64fb331a30b5e5f3165..9e36be42329e225b0cd28ca95e0dfdc2fb0f9471 100644 (file)
@@ -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'
index 34c6e8df2fd2a917fbce303895a662dc213c7c63..03880bddd8aec146cd7e1c45c9462dfc5cd9fd68 100644 (file)
@@ -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())