diff options
-rw-r--r-- | source/blender/render/SConscript | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index dfce2267898..2642d31bd35 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -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['OURPLATFORM'] == 'linux2': 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'): |