summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLynne <dev@lynne.ee>2024-01-31 17:28:56 +0100
committerLynne <dev@lynne.ee>2024-02-18 19:57:47 +0100
commite43615fc2ab27d562ed7e087803f4a364a7d1175 (patch)
treedd8a0b578fee303f0a9984171b17c26ff7624c67
parent749e93d11de9f79c63fbb310f13eb3ae82c469ec (diff)
configure: fix compilation with glslang 14
The configure check already had fallback for the previous version of glslang, which had different requirements for flags. This commit simply moves the flags needed for glslang 13 to the fallback, while first trying to use new flags for glslang 14. This drops support for ~3 year old glslang versions, which I'm not sure had the complete C API we're using anyway.
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index d66694e83e..23066efa32 100755
--- a/configure
+++ b/configure
@@ -6781,11 +6781,11 @@ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
- -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
+ -lglslang -lMachineIndependent -lGenericCodeGen \
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
- -lglslang -lOSDependent -lHLSL -lOGLCompiler \
- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
+ -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ; }
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do