diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-16 22:44:25 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-01-16 22:44:25 +0400 |
| commit | 1b4ced86b911b177ff23fb9aa3d7a76b3714aae8 (patch) | |
| tree | c9c70e0c54c5f08e0e29ed87a8a31eff69ee6fb8 /intern/cycles/SConscript | |
| parent | da523185fba54213b72c7cb6b8ecf7b369af1ccf (diff) | |
Workaround for avx assembler not compiling with vanilla gcc ( with openMP case )
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 7ced4613d64..83d5da981c2 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -102,7 +102,10 @@ optim_defs = defs[:] cycles_avx = cycles.Clone() avx_sources = [path.join('kernel', 'kernel_avx.cpp')] -cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) +if env['OURPLATFORM'] == 'darwin': # always use Apple assembler for avx , gnu-compilers do not support it ( vanilla gcc-4.6 or higher case ) + cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags, cc_compilerchange='/usr/bin/clang', cxx_compilerchange='/usr/bin/clang++') +else: + cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) cycles_sse41 = cycles.Clone() sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')] |