diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2009-11-10 15:08:02 +0300 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2009-11-10 15:08:02 +0300 |
| commit | 10bf807574df6c96becd743544d19e3cda10bf66 (patch) | |
| tree | 683b6ddd3618e96a65c23eaaadd8d820e14662d4 /source/blender/render/SConscript | |
| parent | 51efe7de27119587c918a1e5cc429acca8ca672f (diff) | |
| parent | 14f9e686fa7b729a36549778fcf8e2cfd31bf424 (diff) | |
merged changes to revision 24446
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index e80d277df25..0a1bd1b5598 100644 --- 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'): |