[Bf-blender-cvs] [6a1414dc584] master: Build_environment: Fix unwanted exports from oidn on windows.
Ray Molenkamp
noreply at git.blender.org
Sat Feb 8 23:32:24 CET 2020
Commit: 6a1414dc58485791ff650f044f801b044af0346c
Author: Ray Molenkamp
Date: Sat Feb 8 15:32:19 2020 -0700
Branches: master
https://developer.blender.org/rB6a1414dc58485791ff650f044f801b044af0346c
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
===================================================================
M build_files/build_environment/patches/openimagedenoise.diff
===================================================================
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
More information about the Bf-blender-cvs
mailing list