From 7280321f7a25bf7ec4b2ad9da676ac8b712a4c8a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 27 Jan 2014 19:11:36 +0100 Subject: 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. --- intern/cycles/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/SConscript') 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) -- cgit v1.2.3