Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2020-06-14 20:09:32 +0300
committerRay Molenkamp <github@lazydodo.com>2020-06-14 20:09:32 +0300
commit4155f8dc21a99be61e5dc53ff950c8c72a4ba9c1 (patch)
tree9cc5426355d36a60ccb168acbd95ebe6eef24fe3 /build_files/build_environment/patches/embree.diff
parent9464260ed786c7cd76d6c9c83590a3b13407fdcd (diff)
deps/windows/embree: Prevent exports leaking out of blender binary
embree marks a few of its functions with a dll_export macro forcibly exporting these symbols from whatever binary links them. Given we link embree statically and we do not want these exports in the blender binary, the macro needs to be a no-op.
Diffstat (limited to 'build_files/build_environment/patches/embree.diff')
-rw-r--r--build_files/build_environment/patches/embree.diff14
1 files changed, 14 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/embree.diff b/build_files/build_environment/patches/embree.diff
new file mode 100644
index 00000000000..9b2c66feaf7
--- /dev/null
+++ b/build_files/build_environment/patches/embree.diff
@@ -0,0 +1,14 @@
+diff -Naur orig/common/sys/platform.h external_embree/common/sys/platform.h
+--- orig/common/sys/platform.h 2020-05-13 23:08:53 -0600
++++ external_embree/common/sys/platform.h 2020-06-13 17:40:26 -0600
+@@ -84,8 +84,8 @@
+ ////////////////////////////////////////////////////////////////////////////////
+
+ #ifdef __WIN32__
+-#define dll_export __declspec(dllexport)
+-#define dll_import __declspec(dllimport)
++#define dll_export
++#define dll_import
+ #else
+ #define dll_export __attribute__ ((visibility ("default")))
+ #define dll_import