Fix cross-compile build on Linux.

Makefile.common

@@ -736,11 +736,12 @@ ifeq ($(HAVE_SDL2), 1)
 endif
 
 ifeq ($(HAVE_VULKAN), 1)
-	ifeq ($(platform), win)
+	ifneq ($(findstring Win32,$(OS)),)
 		GLSLANG_PLATFORM := Windows
 	else
 		GLSLANG_PLATFORM := Unix
 	endif
+
 	GLSLANG_SOURCES := \
 		$(wildcard deps/glslang/*.cpp) \
 		$(wildcard deps/glslang/glslang/SPIRV/*.cpp) \
@@ -750,10 +751,16 @@ ifeq ($(HAVE_VULKAN), 1)
 		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
 		$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
 
+	ifneq ($(findstring Win32,$(OS)),)
+		# Trivial temporary workaround for MinGW and glslang.
+		CXXFLAGS += -fpermissive
+	endif
+
 	SPIR2CROSS_SOURCES := deps/spir2cross/spir2cross.cpp
 
 	DEFINES += \
 			  -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
+			  -Ideps/glslang/glslang/OGLCompilersDLL \
 			  -Ideps/glslang/glslang \
 			  -Ideps/glslang/glslang/glslang/MachineIndependent \
 			  -Ideps/glslang/glslang/glslang/Public \
@@ -761,8 +768,8 @@ ifeq ($(HAVE_VULKAN), 1)
 			  -Ideps/glslang \
 			  -Ideps/spir2cross
 
-	CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
-   CFLAGS  += -I./gfx/include/vulkan
+	CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Igfx/include
+	CFLAGS  += -Igfx/include
 
 	GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
 	SPIR2CROSS_OBJ := $(SPIR2CROSS_SOURCES:.cpp=.o)

deps/glslang/glslang

@@ -1 +1 @@
-Subproject commit 5ace09a75be02bd32505f1f94b1b49a6aa3498b8
+Subproject commit c3869fee412a90c4eadea0bf936ab2530d2dff51

libretro-common/net/net_ifinfo.c

@@ -28,8 +28,8 @@
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include <winsock2.h>
-#include <IPHlpApi.h>
-#include <WS2tcpip.h>
+#include <iphlpapi.h>
+#include <ws2tcpip.h>
 #else
 #include <arpa/inet.h>
 #include <sys/socket.h>

qb/config.libs.sh

@@ -394,7 +394,6 @@ if [ "$OS" != 'Win32' ]; then
 fi
 check_lib STRCASESTR "$CLIB" strcasestr
 check_lib MMAP "$CLIB" mmap
-check_lib VULKAN -lvulkan vkCreateInstance
 
 if [ "$HAVE_VULKAN" != 'no' ] && [ ! -e deps/glslang/glslang/README.md ]; then
 	echo "Warning: glslang submodule not loaded, can't use Vulkan."

qb/config.params.sh

@@ -73,5 +73,5 @@ HAVE_MMAP=auto             # MMAP support
 HAVE_QT=no                 # QT companion support
 HAVE_XSHM=no               # XShm video driver support (disabled because it's just a dummied out stub)
 HAVE_CHEEVOS=yes           # Retro Achievements
-HAVE_VULKAN=auto           # Vulkan support
+HAVE_VULKAN=no             # Vulkan support
 C89_VULKAN=no