godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94256 from alvinhochun/embree-include-order-dllexport-fix 

embree: Fix include order causing unwanted dllexport symbols
This commit is contained in:
Rémi Verschelde 2024-08-01 00:06:31 +02:00
parent 2add44c0dc 54851f2333
commit 3c7eb6a4a9
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/embree/common/tasking/taskschedulerinternal.h vendored
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
#include "../../include/embree4/rtcore.h"
#include "../sys/platform.h" #include "../sys/platform.h"
#include "../sys/alloc.h" #include "../sys/alloc.h"
#include "../sys/barrier.h" #include "../sys/barrier.h"
@ -12,7 +13,6 @@
#include "../sys/ref.h" #include "../sys/ref.h"
#include "../sys/atomic.h" #include "../sys/atomic.h"
#include "../math/range.h" #include "../math/range.h"
#include "../../include/embree4/rtcore.h"
#include <list> #include <list>

20
thirdparty/embree/patches/include-order-dllexport-fix.patch vendored Normal file
View File

@ -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>