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-02-09 01:32:19 +0300
committerRay Molenkamp <github@lazydodo.com>2020-02-09 01:32:19 +0300
commit6a1414dc58485791ff650f044f801b044af0346c (patch)
tree86be6774963801750d635f3eef711b1f29217c2c /build_files
parent01cb35cc8f787a13b2e240a38e3fd478eb76825c (diff)
Build_environment: Fix unwanted exports from oidn on windows.
oidn puts dllexport on all its functions causing the blender binary to export these symbols. this patch fixes this unwanted behaviour. Differential Revision: https://developer.blender.org/D6647 Reviewers: brecht , sergey
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/patches/openimagedenoise.diff12
1 files changed, 12 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/openimagedenoise.diff b/build_files/build_environment/patches/openimagedenoise.diff
index 08d7a397a6d..f83b0776c30 100644
--- a/build_files/build_environment/patches/openimagedenoise.diff
+++ b/build_files/build_environment/patches/openimagedenoise.diff
@@ -117,3 +117,15 @@ diff '--ignore-matching-lines=:' -ur '--exclude=*.svn*' -u -r
if(OIDN_STATIC_LIB)
set(OIDN_LIB_TYPE STATIC)
else()
+diff -Naur orig/core/api.cpp external_openimagedenoise/core/api.cpp
+--- orig/core/api.cpp 2019-07-19 08:37:04 -0600
++++ external_openimagedenoise/core/api.cpp 2020-01-21 15:10:56 -0700
+@@ -15,7 +15,7 @@
+ // ======================================================================== //
+
+ #ifdef _WIN32
+-# define OIDN_API extern "C" __declspec(dllexport)
++# define OIDN_API extern "C"
+ #else
+ # define OIDN_API extern "C" __attribute__ ((visibility ("default")))
+ #endif