qb: Improve the glsl check.

This commit is contained in:
orbea 2019-07-21 00:36:13 -07:00
parent cd90760b7b
commit 19774f820f
2 changed files with 3 additions and 8 deletions

View File

@ -378,14 +378,8 @@ elif [ "$HAVE_OPENGLES" != 'no' ] && [ "$HAVE_OPENGLES3" != 'yes' ]; then
HAVE_OPENGL_CORE='no'
fi
if [ "$HAVE_OPENGL" != 'no' ] || [ "$HAVE_OPENGLES" != 'no' ] || [ "$HAVE_OPENGLES3" != 'no' ]; then
HAVE_GLSL='yes'
else
if [ "$HAVE_GLSL" != "no" ]; then
die : 'Notice: glsl disabled.'
HAVE_GLSL='no'
fi
fi
check_enabled 'OPENGL OPENGLES OPENGLES3' GLSL GLSL \
'OpenGL and OpenGLES are' false
check_enabled ZLIB BUILTINZLIB 'builtin zlib' 'zlib is' true

View File

@ -151,6 +151,7 @@ HAVE_VIDEOCORE=auto # Broadcom Videocore 4 support
HAVE_DRMINGW=no # DrMingw exception handler
HAVE_EASTEREGG=yes # Easter egg
HAVE_CDROM=auto # CD-ROM support
HAVE_GLSL=yes # GLSL shaders support
HAVE_SLANG=yes # slang support
C89_SLANG=no
HAVE_GLSLANG=yes # glslang support (requires C++11)