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.
This commit is contained in:
parent
749e93d11d
commit
e43615fc2a
6
configure
vendored
6
configure
vendored
@ -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 libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
|
||||||
enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
|
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 \
|
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 ||
|
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
|
||||||
require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
|
require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
|
||||||
-lglslang -lOSDependent -lHLSL -lOGLCompiler \
|
-lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
|
||||||
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
|
-lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ; }
|
||||||
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
|
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
|
||||||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
|
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
|
||||||
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
|
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
|
||||||
|
Loading…
Reference in New Issue
Block a user