diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-01 00:06:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-01 00:06:31 +0200 |
| commit | 3c7eb6a4a9db84a79f2840cfa5dce1790c90fd45 (patch) | |
| tree | fcabaf212d6811b1927fc706d2230291a9e03ca5 /thirdparty | |
| parent | 2add44c0dcc66ffa9b5d4d92d7aa8579ad49f85d (diff) | |
| parent | 54851f2333f86a703f718875428415c1f29194d4 (diff) | |
| download | redot-engine-3c7eb6a4a9db84a79f2840cfa5dce1790c90fd45.tar.gz | |
Merge pull request #94256 from alvinhochun/embree-include-order-dllexport-fix
embree: Fix include order causing unwanted dllexport symbols
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/embree/common/tasking/taskschedulerinternal.h | 2 | ||||
| -rw-r--r-- | thirdparty/embree/patches/include-order-dllexport-fix.patch | 20 |
2 files changed, 21 insertions, 1 deletions
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 <list> 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 0000000000..ece57a8daf --- /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 <list> + |