(qb) Add HAVE_SLANG, HAVE_SPIRV_CROSS, HAVE_GLSLANG

Makefile.common

@@ -1263,10 +1263,6 @@ ifeq ($(HAVE_VULKAN), 1)
    NEED_CXX_LINKER = 1
    DEFINES += -DHAVE_VULKAN
    INCLUDE_DIRS += -Igfx/include
-
-   HAVE_SLANG       = 1
-   HAVE_GLSLANG     = 1
-   HAVE_SPIRV_CROSS = 1
 endif
 
 ifeq ($(HAVE_OPENGL_CORE), 1)
@@ -1278,9 +1274,6 @@ ifeq ($(HAVE_OPENGL_CORE), 1)
    endif
 
    DEFINES += -DHAVE_OPENGL_CORE
-   HAVE_SLANG       = 1
-   HAVE_GLSLANG     = 1
-   HAVE_SPIRV_CROSS = 1
    NEED_CXX_LINKER  = 1
 endif
 
@@ -1369,9 +1362,6 @@ ifeq ($(HAVE_D3D11), 1)
       OBJ += menu/drivers_display/menu_display_d3d11.o
    endif
    DEFINES += -DHAVE_D3D11
-   HAVE_SLANG       = 1
-   HAVE_GLSLANG     = 1
-   HAVE_SPIRV_CROSS = 1
 endif
 
 ifeq ($(HAVE_D3D12), 1)
@@ -1382,9 +1372,6 @@ ifeq ($(HAVE_D3D12), 1)
       OBJ += menu/drivers_display/menu_display_d3d12.o
    endif
    DEFINES += -DHAVE_D3D12
-   HAVE_SLANG       = 1
-   HAVE_GLSLANG     = 1
-   HAVE_SPIRV_CROSS = 1
 endif
 
 ifneq ($(findstring 1, $(HAVE_D3D10) $(HAVE_D3D11) $(HAVE_D3D12)),)

qb/config.libs.sh

@@ -518,6 +518,43 @@ if [ "$HAVE_MENU" != 'no' ]; then
    fi
 fi
 
+if [ "$HAVE_SLANG" = 'no' ] ||
+   [ "$HAVE_GLSLANG" = 'no' ] ||
+   [ "$HAVE_SPIRV_CROSS" = 'no' ]; then
+   die : 'Notice: slang/glslang/SPIRV Cross disabled, disabling video drivers:'
+
+if [ "$HAVE_SLANG" != "no" ]; then
+   HAVE_SLANG=no
+fi
+if [ "$HAVE_GLSLANG" != "no" ]; then
+   HAVE_GLSLANG=no
+fi
+if [ "$HAVE_SPIRV_CROSS" != "no" ]; then
+   HAVE_SPIRV_CROSS=no
+fi
+
+if [ "$HAVE_D3D10" != "no" ]; then
+   die : 'd3d10'
+   HAVE_D3D10=no
+fi
+if [ "$HAVE_D3D11" != "no" ]; then
+   die : 'd3d11'
+   HAVE_D3D11=no
+fi
+if [ "$HAVE_D3D12" != "no" ]; then
+   die : 'd3d12'
+   HAVE_D3D12=no
+fi
+if [ "$HAVE_OPENGL_CORE" != "no" ]; then
+   die : 'glcore'
+   HAVE_OPENGL_CORE=no
+fi
+if [ "$HAVE_VULKAN" != "no" ]; then
+   die : 'vulkan'
+   HAVE_VULKAN=no
+fi
+fi
+
 check_macro NEON __ARM_NEON__
 
 add_define MAKEFILE OS "$OS"

qb/config.params.sh

@@ -150,3 +150,8 @@ 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_SLANG=yes             # slang support
+HAVE_GLSLANG=auto          # glslang support (requires C++11)
+C89_GLSLANG=no
+HAVE_SPIRV_CROSS=auto      # SPIRV-Cross support (requires C++11)
+C89_SPIRV_CROSS=no