[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47107] trunk/blender: Scons / MSVC - Windows x64

[Thomas Dinges]

Revision: 47107
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47107
Author:   dingto
Date:     2012-05-28 09:20:04 +0000 (Mon, 28 May 2012)
Log Message:
-----------
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. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-05-28 09:01:43 UTC (rev 47106)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-05-28 09:20:04 UTC (rev 47107)
@@ -166,7 +166,8 @@
 
 #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'

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2012-05-28 09:01:43 UTC (rev 47106)
+++ trunk/blender/intern/cycles/SConscript	2012-05-28 09:20:04 UTC (rev 47107)
@@ -46,8 +46,10 @@
 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())