diff --git a/config.def.h b/config.def.h
index 6a685e9437..cc7fd22b1f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -917,7 +917,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/
 #elif defined(_WIN32) && !defined(_XBOX)
 #if defined(__x86_64__)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86_64/latest/";
-#elif defined(__i386__) || defined(__i486__) || defined(__i686__)
+#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86/latest/";
 #endif
 #elif defined(__linux__)
diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross
index cc207e32c8..5c24d99ff2 160000
--- a/deps/SPIRV-Cross
+++ b/deps/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6
+Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418
diff --git a/deps/glslang/glslang b/deps/glslang/glslang
index 2eb0986f10..a4a4d5e22c 160000
--- a/deps/glslang/glslang
+++ b/deps/glslang/glslang
@@ -1 +1 @@
-Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440
+Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b