diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-02-01 23:47:23 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-02-01 23:47:23 +0300 |
| commit | 18a2b9940e5b74475ab72359271656e7117aa9a2 (patch) | |
| tree | 845c784b911f5a728cf2d55594b10ccc9ccd1cbd /source/blender/render/SConscript | |
| parent | 107667d20a15593f5c94437cc57fe786bcb92f7a (diff) | |
| parent | 58b89bbac30a65ae8a7bc0f2063422670e3ec0b1 (diff) | |
Merged changes in the trunk up to revision 26533.
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index f3a997aa5bf..7f80731e26d 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -34,6 +34,11 @@ if env['OURPLATFORM'] == 'linux2': cxxflags = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] incs += ' ../../../extern/binreloc/include' +if env['OURPLATFORM'] == 'linuxcross': + if env['WITH_BF_RAYOPTIMIZATION']: + cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] + cxxflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] + if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ../quicktime ' + env['BF_QUICKTIME_INC'] @@ -44,6 +49,12 @@ if env['WITH_BF_OPENEXR']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +# +# HACK: To fix problem with error 'MMX instruction set not enabled' from mmintrin.h +# +if env['OURPLATFORM'] == 'linuxcross': + defs.append('__MMX__') + if env['WITH_BF_RAYOPTIMIZATION']: defs.append('__SSE__') |