From a792112bd1ff73ef24756eef50b8776131f3b6cd Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 30 Dec 2017 04:36:35 +0100
Subject: [PATCH] Update glslang support for MSVC

---
 deps/glslang/glslang.cpp         | 4 ++--
 deps/glslang/glslang/SPIRV/doc.h | 5 +++++
 griffin/griffin_cpp.cpp          | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/deps/glslang/glslang.cpp b/deps/glslang/glslang.cpp
index 1321683c9c..4a7eda479d 100644
--- a/deps/glslang/glslang.cpp
+++ b/deps/glslang/glslang.cpp
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2016 - Hans-Kristian Arntzen
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -16,7 +16,7 @@
 #include "glslang.hpp"
 
 #include "glslang/glslang/Public/ShaderLang.h"
-#include "GlslangToSpv.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
 #include <vector>
 #include <iostream>
 #include <cstring>
diff --git a/deps/glslang/glslang/SPIRV/doc.h b/deps/glslang/glslang/SPIRV/doc.h
index dfc5662667..e7afbaee27 100644
--- a/deps/glslang/glslang/SPIRV/doc.h
+++ b/deps/glslang/glslang/SPIRV/doc.h
@@ -32,6 +32,9 @@
 //ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 //POSSIBILITY OF SUCH DAMAGE.
 
+#ifndef _SPIRV_doc_h
+#define _SPIRV_doc_h
+
 //
 // Parameterize the SPIR-V enumerants.
 //
@@ -258,3 +261,5 @@ const char* AccessQualifierString(int attr);
 void PrintOperands(const OperandParameters& operands, int reservedOperands);
 
 };  // end namespace spv
+
+#endif
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 620c2002fa..e914b12132 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -1,4 +1,4 @@
-/* RetroArch - A frontend for libretro.
+/* RetroArch - A frontend for libretro.
 * Copyright (C) 2011-2017 - Daniel De Matteis
 *
 * RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -28,7 +28,9 @@
 #ifdef WANT_GLSLANG
 #ifdef HAVE_VULKAN
 #include "../deps/glslang/glslang.cpp"
+#if 0
 #include "../deps/glslang/glslang_tab.cpp"
+#endif
 #include "../deps/glslang/glslang/SPIRV/disassemble.cpp"
 #include "../deps/glslang/glslang/SPIRV/doc.cpp"
 #include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp"