merged changes to revision 24446

[blender.git] / source / blender / render / SConscript

diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index e80d277df25e49122628eb2df823aeecc06d717f..0a1bd1b5598aa09a0f29921b679aeab4e33d18bc 100644 (file)
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -5,9 +5,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
        # FIXME: need to set the appropriate flags for msvc, otherwise we get warnings
        cflags = []
        cxxflags = []
-else:
-       cflags = ['-O2','-msse2','-mfpmath=sse']
-       cxxflags = ['-O2','-msse2','-mfpmath=sse']
+
+if env['OURPLATFORM'] == 'darwin':
+       if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64'):
+               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')
@@ -25,12 +30,9 @@ if env['WITH_BF_QUICKTIME']:
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
-if env['OURPLATFORM']=='linux2':
-    cflags += ['-pthread']
-
-
 if env['OURPLATFORM'] == 'linux2':
-    cflags='-pthread'
+    cflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
+    cxxflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
     incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):