From 62ab2fcc9c54923c508e717cce0481abbddc5f8e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 4 Dec 2016 04:19:13 +0100
Subject: [PATCH] SPIRV-Cross buildfix

---
 Makefile.common         | 3 ++-
 deps/SPIRV-Cross        | 2 +-
 deps/glslang/glslang    | 2 +-
 griffin/griffin_cpp.cpp | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 7de2ceb6ad..f2c9fbae37 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -870,7 +870,8 @@ ifeq ($(HAVE_VULKAN), 1)
       $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp) \
       $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
 
-   SPIRV_CROSS_SOURCES := $(DEPS_DIR)/SPIRV-Cross/spirv_cross.cpp
+   SPIRV_CROSS_SOURCES := $(DEPS_DIR)/SPIRV-Cross/spirv_cross.cpp \
+								  $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.cpp
    ifneq ($(findstring Win32,$(OS)),)
       # Trivial temporary workaround for MinGW and glslang.
       CXXFLAGS += -fpermissive
diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross
index 5c24d99ff2..b9600aa8d3 160000
--- a/deps/SPIRV-Cross
+++ b/deps/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418
+Subproject commit b9600aa8d3d1ff4c412d316fcd56c0951addcc33
diff --git a/deps/glslang/glslang b/deps/glslang/glslang
index a4a4d5e22c..2eb0986f10 160000
--- a/deps/glslang/glslang
+++ b/deps/glslang/glslang
@@ -1 +1 @@
-Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b
+Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 80621c44a7..43cf0302a1 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -175,6 +175,7 @@ VIDEO DRIVER
 #include "../gfx/drivers_shader/glslang_util.cpp"
 #include "../gfx/drivers_shader/slang_reflection.cpp"
 #include "../deps/SPIRV-Cross/spirv_cross.cpp"
+#include "../deps/SPIRV-Cross/spirv_cfg.cpp"
 #endif
 
 /*============================================================