diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-07 23:30:35 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-07 23:30:35 +0200 |
| commit | f9c5cdf360487be0a575c079b1b8075a1505cb6a (patch) | |
| tree | a7381dadf917fd0b1b050a70a859d3b71ed7812f /thirdparty | |
| parent | f58d508cc406f8979f92e0562b5772c0df8f2975 (diff) | |
| parent | 3cc3c0bd952fb7c4db96a8f167ac917ce5a84a78 (diff) | |
| download | redot-engine-f9c5cdf360487be0a575c079b1b8075a1505cb6a.tar.gz | |
Merge pull request #92819 from alula/patch-1
Fix building glslang on platforms without `<filesystem>`
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/glslang/glslang/Include/InfoSink.h | 2 | ||||
| -rw-r--r-- | thirdparty/glslang/patches/disable-absolute-paths-for-apple-compat.patch (renamed from thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch) | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h index b1b537df54..137ede8510 100644 --- a/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 { diff --git a/thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch b/thirdparty/glslang/patches/disable-absolute-paths-for-apple-compat.patch index d15a531b7c..135020737e 100644 --- a/thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch +++ b/thirdparty/glslang/patches/disable-absolute-paths-for-apple-compat.patch @@ -1,7 +1,16 @@ 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 +++ 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: snprintf(locText, maxSize, ":%d", loc.line); |