[Bf-blender-cvs] [0f3fed2] master: OS X linker does not like empty compilation unit by itself in a library. Scons creates one library (.a) per kernel. This fixes that
Martijn Berger
noreply at git.blender.org
Tue Jan 14 22:49:01 CET 2014
Commit: 0f3fed2970a867bd97cdb79c4848a2961f922f60
Author: Martijn Berger
Date: Tue Jan 14 22:48:23 2014 +0100
https://developer.blender.org/rB0f3fed2970a867bd97cdb79c4848a2961f922f60
OS X linker does not like empty compilation unit by itself in a library. Scons creates one library (.a) per kernel. This fixes that
===================================================================
M intern/cycles/kernel/kernel_sse2.cpp
M intern/cycles/kernel/kernel_sse3.cpp
M intern/cycles/kernel/kernel_sse41.cpp
===================================================================
diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp
index 953c3e4..83f4b19 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 2a36c97..20c8796 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 6583fea..31294dd 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
More information about the Bf-blender-cvs
mailing list