diff options
author | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 21:39:41 +0300 |
---|---|---|
committer | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 21:39:41 +0300 |
commit | f2a8bb34989204dbdfee39cc6279808b5d5a8c9a (patch) | |
tree | df7bfbcac23d77e1d38c5c9a70ff9740c0028aec /source/blender/render | |
parent | 7fe3ab7e8e23fb8750eead8f53802928b734821c (diff) |
this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
Diffstat (limited to 'source/blender/render')
-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 d9a074c1470..366f6bd723c 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__') |