ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

OSX/Cycles: tentative fix for avx, try use the compiler that is default on desired xcode version.

Browse source 
Atm. it is only verified to work with clang 5.0, so either this works too with llvm-gcc or apple gcc,
or we have to rise the requirements for osx.
This commit is contained in:
Jens Verwiebe 2014-01-17 14:56:16 +01:00
parent bec9a3fa7c
commit 8842569bc4
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
intern/cycles/SConscript
View file

@ -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/clang', cxx_compilerchange='/usr/bin/clang++')
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++')
else:
cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags)