[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25134] trunk/blender/source/blender/ render/SConscript: * proper SSE setting for mingw.

[Nathan Letwory]

Revision: 25134
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25134
Author:   jesterking
Date:     2009-12-05 02:07:42 +0100 (Sat, 05 Dec 2009)

Log Message:
-----------
* proper SSE setting for mingw.
* some cleanup of render module SConscript

Modified Paths:
--------------
    trunk/blender/source/blender/render/SConscript

Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript	2009-12-05 00:26:20 UTC (rev 25133)
+++ trunk/blender/source/blender/render/SConscript	2009-12-05 01:07:42 UTC (rev 25134)
@@ -1,21 +1,21 @@
 #!/usr/bin/python
 Import ('env')
 
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
-    # FIXME: need to set the appropriate flags for msvc, otherwise we get warnings
+cflags = env['CCFLAGS']
+cxxflags = env['CXXFLAGS']
+
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     if env['WITH_BF_RAYOPTIMIZATION']:
         cflags = env['CCFLAGS'] + ['/arch:SSE']
-    else:
-        cflags = env['CCFLAGS']
-    cxxflags = []
 
+if env['OURPLATFORM'] == 'win32-mingw':
+    if env['WITH_BF_RAYOPTIMIZATION']:
+        cflags = env['CCFLAGS'] + ['-mfpmath=sse']
+
 if env['OURPLATFORM'] == 'darwin':
     if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64') and env['WITH_BF_RAYOPTIMIZATION']:
         cflags = env['CFLAGS'] + ['-mfpmath=sse']
         cxxflags = env['CXXFLAGS'] + ['-mfpmath=sse']
-    else:
-        cflags = env['CFLAGS']
-        cxxflags = env['CXXFLAGS']
 
 sources = env.Glob('intern/source/*.c')
 raysources = env.Glob('intern/raytrace/*.cpp')
@@ -40,9 +40,6 @@
     if env['WITH_BF_RAYOPTIMIZATION']:
         cflags = env['CCFLAGS'] +  ['-O2','-msse2','-mfpmath=sse', '-pthread']
         cxxflags = env['CXXFLAGS'] +  ['-O2','-msse2','-mfpmath=sse', '-pthread']
-    else:
-        cflags = env['CCFLAGS']
-        cxxflags = env['CXXFLAGS']
     incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):