CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-01 16:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10972 from keithbowes/system-glslang-fix

Browse Source 
Fix detection of system glslang
This commit is contained in:
Autechre 2020-07-06 05:07:37 +02:00 committed by GitHub
commit c10d94b15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qb/config.libs.sh
View File

@ -527,14 +527,14 @@ else
fi
if [ "$HAVE_MENU" != 'no' ]; then
if [ "$HAVE_OPENGL" = 'no' ] &&
if [ "$HAVE_OPENGL" = 'no' ] &&
[ "$HAVE_OPENGL1" = 'no' ] &&
[ "$HAVE_OPENGLES" = 'no' ] &&
[ "$HAVE_OPENGLES" = 'no' ] &&
[ "$HAVE_OPENGL_CORE" = 'no' ] &&
[ "$HAVE_VULKAN" = 'no' ] &&
[ "$HAVE_D3D10" = 'no' ] &&
[ "$HAVE_D3D11" = 'no' ] &&
[ "$HAVE_D3D12" = 'no' ] &&
[ "$HAVE_VULKAN" = 'no' ] &&
[ "$HAVE_D3D10" = 'no' ] &&
[ "$HAVE_D3D11" = 'no' ] &&
[ "$HAVE_D3D12" = 'no' ] &&
[ "$HAVE_METAL" = 'no' ]; then
if [ "$OS" = 'Win32' ]; then
HAVE_SHADERPIPELINE=no
@ -570,10 +570,10 @@ if [ "$HAVE_GLSLANG" != no ]; then
glslang/Public/ShaderLang.h \
glslang/SPIRV/GlslangToSpv.h
check_lib cxx GLSLANG -lglslang
check_lib cxx GLSLANG -lglslang '' '-lSPIRV'
check_lib cxx GLSLANG_OSDEPENDENT -lOSDependent
check_lib cxx GLSLANG_OGLCOMPILER -lOGLCompiler
check_lib cxx GLSLANG_HLSL -lHLSL
check_lib cxx GLSLANG_HLSL -lHLSL '' '-lglslang -lSPIRV'
check_lib cxx GLSLANG_SPIRV -lSPIRV
check_lib cxx GLSLANG_SPIRV_TOOLS_OPT -lSPIRV-Tools-opt
check_lib cxx GLSLANG_SPIRV_TOOLS -lSPIRV-Tools