From 0f3fed2970a867bd97cdb79c4848a2961f922f60 Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Tue, 14 Jan 2014 22:48:23 +0100 Subject: OS X linker does not like empty compilation unit by itself in a library. Scons creates one library (.a) per kernel. This fixes that --- intern/cycles/kernel/kernel_sse2.cpp | 5 +++++ intern/cycles/kernel/kernel_sse3.cpp | 4 ++++ intern/cycles/kernel/kernel_sse41.cpp | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index 953c3e4f9c9..83f4b19ea9e 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -71,4 +71,9 @@ void kernel_cpu_sse2_shader(KernelGlobals *kg, uint4 *input, float4 *output, int CCL_NAMESPACE_END +#else + +/* needed for some linkers in combination with scons making empty compilation unit in a library */ +void __dummy_function_cycles_sse2(){} + #endif diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp index 2a36c974191..20c87960ae7 100644 --- a/intern/cycles/kernel/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernel_sse3.cpp @@ -72,5 +72,9 @@ void kernel_cpu_sse3_shader(KernelGlobals *kg, uint4 *input, float4 *output, int } CCL_NAMESPACE_END +#else + +/* needed for some linkers in combination with scons making empty compilation unit in a library */ +void __dummy_function_cycles_sse3(){} #endif diff --git a/intern/cycles/kernel/kernel_sse41.cpp b/intern/cycles/kernel/kernel_sse41.cpp index 6583feaeb45..31294ddc521 100644 --- a/intern/cycles/kernel/kernel_sse41.cpp +++ b/intern/cycles/kernel/kernel_sse41.cpp @@ -73,5 +73,9 @@ void kernel_cpu_sse41_shader(KernelGlobals *kg, uint4 *input, float4 *output, in } CCL_NAMESPACE_END +#else + +/* needed for some linkers in combination with scons making empty compilation unit in a library */ +void __dummy_function_cycles_sse41(){} #endif -- cgit v1.2.3