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

Merge pull request #92819 from alula/patch-1 

Fix building glslang on platforms without `<filesystem>`
This commit is contained in:
Rémi Verschelde 2024-06-07 23:30:35 +02:00
parent f58d508cc4 3cc3c0bd95
commit f9c5cdf360
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/glslang/glslang/Include/InfoSink.h vendored
View File

@ -36,7 +36,7 @@
#define _INFOSINK_INCLUDED_ #define _INFOSINK_INCLUDED_
#include "../Include/Common.h" #include "../Include/Common.h"
#include <filesystem> //#include <filesystem>
#include <cmath> #include <cmath>
namespace glslang { namespace glslang {

11
thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch → thirdparty/glslang/patches/disable-absolute-paths-for-apple-compat.patch vendored
View File

@ -1,7 +1,16 @@
diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h
index 23f495dcb7..b1b537df54 100644 index 23f495dc..137ede85 100644
--- a/thirdparty/glslang/glslang/Include/InfoSink.h --- a/thirdparty/glslang/glslang/Include/InfoSink.h
+++ b/thirdparty/glslang/glslang/Include/InfoSink.h +++ b/thirdparty/glslang/glslang/Include/InfoSink.h
@@ -36,7 +36,7 @@
#define _INFOSINK_INCLUDED_
#include "../Include/Common.h"
-#include <filesystem>
+//#include <filesystem>
#include <cmath>
namespace glslang {
@@ -101,14 +101,14 @@ public: @@ -101,14 +101,14 @@ public:
snprintf(locText, maxSize, ":%d", loc.line); snprintf(locText, maxSize, ":%d", loc.line);