From 301450b1ebc046397797918bab67434da70068bc Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Sat, 7 Jun 2025 16:54:25 +0800 Subject: [PATCH] attempt to use system glslc first before using bundled glslc --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7a21bd629..33a626739 100644 --- a/Makefile +++ b/Makefile @@ -714,13 +714,17 @@ ifeq ($(OS),Windows_NT) @echo 'Vulkan Shaders Rebuilt for Windows...' else @echo 'Now rebuilding vulkan shaders for Linux...' - @chmod +x vulkan-shaders-gen glslc-linux - @echo 'Checking if bundled glslc-linux binary is usable...' + @echo 'Checking if system glslc-linux binary is usable...' @GLSLC_BIN=$$( \ - if [ -x ./glslc-linux ] && ./glslc-linux --version 2>/dev/null | grep -q "glslang"; then \ - echo "./glslc-linux"; \ - elif command -v glslc >/dev/null 2>&1; then \ + if command -v glslc >/dev/null 2>&1 && glslc --version 2>/dev/null | grep -q "glslang"; then \ echo "glslc"; \ + elif [ -x ./glslc-linux ]; then \ + chmod +x ./glslc-linux; \ + if ./glslc-linux --version 2>/dev/null | grep -q "glslang"; then \ + echo "./glslc-linux"; \ + else \ + echo ""; \ + fi; \ else \ echo ""; \ fi); \