Skip to content

Commit f9c5cdf

Browse files
committed
Merge pull request godotengine#92819 from alula/patch-1
Fix building glslang on platforms without `<filesystem>`
2 parents f58d508 + 3cc3c0b commit f9c5cdf

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

thirdparty/glslang/glslang/Include/InfoSink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define _INFOSINK_INCLUDED_
3737

3838
#include "../Include/Common.h"
39-
#include <filesystem>
39+
//#include <filesystem>
4040
#include <cmath>
4141

4242
namespace glslang {

thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch renamed to thirdparty/glslang/patches/disable-absolute-paths-for-apple-compat.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h
2-
index 23f495dcb7..b1b537df54 100644
2+
index 23f495dc..137ede85 100644
33
--- a/thirdparty/glslang/glslang/Include/InfoSink.h
44
+++ b/thirdparty/glslang/glslang/Include/InfoSink.h
5+
@@ -36,7 +36,7 @@
6+
#define _INFOSINK_INCLUDED_
7+
8+
#include "../Include/Common.h"
9+
-#include <filesystem>
10+
+//#include <filesystem>
11+
#include <cmath>
12+
13+
namespace glslang {
514
@@ -101,14 +101,14 @@ public:
615
snprintf(locText, maxSize, ":%d", loc.line);
716

0 commit comments

Comments
 (0)