Commit: 1b4ced86b911b177ff23fb9aa3d7a76b3714aae8
Author: Jens Verwiebe
Date: Thu Jan 16 19:44:25 2014 +0100
https://developer.blender.org/rB1b4ced86b911b177ff23fb9aa3d7a76b3714aae8
Workaround for avx assembler not compiling with vanilla gcc ( with openMP case )
===================================================================
M intern/cycles/SConscript
===================================================================
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 7ced461..83d5da9 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')]
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
