diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-27 22:11:36 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-27 22:13:25 +0400 |
| commit | 7280321f7a25bf7ec4b2ad9da676ac8b712a4c8a (patch) | |
| tree | 349487678e5a28327af8c471b6a80af3e67723fa /intern/cycles/SConscript | |
| parent | a5c35fb27f090bb716a3bb49a69a56be80dff6d3 (diff) | |
Revert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX.
Both need a better solution and break working builds.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 2b97d54dc08..efd4a88c80c 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -103,7 +103,7 @@ optim_defs = defs[:] cycles_avx = cycles.Clone() avx_sources = [path.join('kernel', 'kernel_avx.cpp')] 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/gcc', cxx_compilerchange='/usr/bin/g++') + cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) else: cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) |