From 3cc3c0bd952fb7c4db96a8f167ac917ce5a84a78 Mon Sep 17 00:00:00 2001 From: alula <6276139+alula@users.noreply.github.com> Date: Wed, 5 Jun 2024 23:05:59 +0200 Subject: [PATCH] fix building glslang on platforms without --- thirdparty/glslang/glslang/Include/InfoSink.h | 2 +- .../disable-absolute-paths-for-apple-compat.patch | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) rename thirdparty/glslang/{glslang => }/patches/disable-absolute-paths-for-apple-compat.patch (82%) diff --git a/thirdparty/glslang/glslang/Include/InfoSink.h b/thirdparty/glslang/glslang/Include/InfoSink.h index b1b537df54b..137ede8510c 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 +//#include #include 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 similarity index 82% rename from thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch rename to thirdparty/glslang/patches/disable-absolute-paths-for-apple-compat.patch index d15a531b7cc..135020737ea 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 ++//#include + #include + + namespace glslang { @@ -101,14 +101,14 @@ public: snprintf(locText, maxSize, ":%d", loc.line);