From 54851f2333f86a703f718875428415c1f29194d4 Mon Sep 17 00:00:00 2001 From: Alvin Wong Date: Fri, 12 Jul 2024 17:52:00 +0800 Subject: [PATCH] embree: Fix include order causing unwanted dllexport symbols --- .../common/tasking/taskschedulerinternal.h | 2 +- .../patches/include-order-dllexport-fix.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 thirdparty/embree/patches/include-order-dllexport-fix.patch diff --git a/thirdparty/embree/common/tasking/taskschedulerinternal.h b/thirdparty/embree/common/tasking/taskschedulerinternal.h index e72d3b72bace..8e3befb739f1 100644 --- a/thirdparty/embree/common/tasking/taskschedulerinternal.h +++ b/thirdparty/embree/common/tasking/taskschedulerinternal.h @@ -3,6 +3,7 @@ #pragma once +#include "../../include/embree4/rtcore.h" #include "../sys/platform.h" #include "../sys/alloc.h" #include "../sys/barrier.h" @@ -12,7 +13,6 @@ #include "../sys/ref.h" #include "../sys/atomic.h" #include "../math/range.h" -#include "../../include/embree4/rtcore.h" #include diff --git a/thirdparty/embree/patches/include-order-dllexport-fix.patch b/thirdparty/embree/patches/include-order-dllexport-fix.patch new file mode 100644 index 000000000000..ece57a8daf91 --- /dev/null +++ b/thirdparty/embree/patches/include-order-dllexport-fix.patch @@ -0,0 +1,20 @@ +diff --git a/thirdparty/embree/common/tasking/taskschedulerinternal.h b/thirdparty/embree/common/tasking/taskschedulerinternal.h +index e72d3b72ba..8e3befb739 100644 +--- a/thirdparty/embree/common/tasking/taskschedulerinternal.h ++++ b/thirdparty/embree/common/tasking/taskschedulerinternal.h +@@ -3,6 +3,7 @@ + + #pragma once + ++#include "../../include/embree4/rtcore.h" + #include "../sys/platform.h" + #include "../sys/alloc.h" + #include "../sys/barrier.h" +@@ -12,7 +13,6 @@ + #include "../sys/ref.h" + #include "../sys/atomic.h" + #include "../math/range.h" +-#include "../../include/embree4/rtcore.h" + + #include +