Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Workaround for avx assembler not compiling with vanilla gcc ( with openMP case )

Browse Source
This commit is contained in:
Jens Verwiebe
2014-01-16 19:44:25 +01:00
parent da523185fb
commit 1b4ced86b9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/SConscript
View File

@@ -102,7 +102,10 @@ optim_defs = defs[:]
cycles_avx = cycles.Clone() cycles_avx = cycles.Clone()
avx_sources = [path.join('kernel', 'kernel_avx.cpp')] 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() cycles_sse41 = cycles.Clone()
sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')] sse41_sources = [path.join('kernel', 'kernel_sse41.cpp')]