diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-30 03:08:30 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-30 03:08:30 +0300 |
| commit | 837e9dcade7e0c60d61f1917fd5a2ec29e22b364 (patch) | |
| tree | cf6ea5d2a2a28146c2e673cae63338adc536e8c4 /source/blender/render/SConscript | |
| parent | 10bf807574df6c96becd743544d19e3cda10bf66 (diff) | |
| parent | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (diff) | |
Merged changes to revision 25007.
The following files were according to the Math Lib reorganization
(see the commit log of revision 24464 for more information):
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
The file release/scripts/ui/properties_render.py was also updated
according the RNA UI API renaming in revision 24795.
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 0a1bd1b5598..d0cff4c1761 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -31,8 +31,11 @@ if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') if env['OURPLATFORM'] == 'linux2': - cflags = ['-O2','-msse2','-mfpmath=sse', '-pthread'] - cxxflags = ['-O2','-msse2','-mfpmath=sse', '-pthread'] +# SSE is NOT safe all the time on linux, plus that ignores users compile flags and therefore no no +# cflags = ['-O2','-msse2','-mfpmath=sse', '-pthread'] +# cxxflags = ['-O2','-msse2','-mfpmath=sse', '-pthread'] + cflags = env['CCFLAGS'] + cxxflags = env['CXXFLAGS'] incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): |