[Bf-blender-cvs] [e68ba7e] soc-2014-cycles: Merge remote-tracking branch 'origin/master' into soc-2014-cycles

[Thomas Dinges]

Commit: e68ba7e1c4fc0b33cbd373c0fa2c694090749cc0
Author: Thomas Dinges
Date:   Mon May 19 10:00:52 2014 +0200
https://developer.blender.org/rBe68ba7e1c4fc0b33cbd373c0fa2c694090749cc0

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

===================================================================



===================================================================

diff --cc intern/cycles/SConscript
index 65b7f24,542bb82..dab8f25
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@@ -96,10 -95,9 +96,10 @@@ elif env['OURPLATFORM'] == 'win64-vc'
      kernel_flags['sse2'] = '-D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /GS-'
      kernel_flags['sse3'] = kernel_flags['sse2']
  
-     if env['MSVC_VERSION'] in ('11.0', '12.0'):
+     if env['MSVC_VERSION'] >= '12.0':
          kernel_flags['sse41'] = kernel_flags['sse3']
          kernel_flags['avx'] = kernel_flags['sse41'] + ' /arch:AVX'
 +        kernel_flags['avx2'] = kernel_flags['sse41'] + ' /arch:AVX /arch:AVX2'
  else:
      # -mavx only available with relatively new gcc/clang
      kernel_flags['sse2'] = '-ffast-math -msse -msse2 -mfpmath=sse'