From 8e1e717cae690e789c975b914a33f346e97799d3 Mon Sep 17 00:00:00 2001
From: Johannes van Waveren <janpaul.vanwaveren@oculus.com>
Date: Fri, 21 Oct 2016 17:21:12 +0900
Subject: [PATCH] fixed MSVC 2015 compile warnings
---
SPIRV/GlslangToSpv.h | 4 ++++
glslang/Include/Common.h | 4 ++++
glslang/Include/intermediate.h | 5 +++++
3 files changed, 13 insertions(+)
diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
index 97b280ca3..428cfb6a7 100644
--- a/SPIRV/GlslangToSpv.h
+++ b/SPIRV/GlslangToSpv.h
@@ -32,6 +32,10 @@
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE.
+#if _MSC_VER >= 1900
+ #pragma warning(disable : 4464) // relative include path contains '..'
+#endif
+
#include "../glslang/Include/intermediate.h"
#include <string>
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h
index efb78d44f..368d8746d 100644
--- a/glslang/Include/Common.h
+++ b/glslang/Include/Common.h
@@ -81,6 +81,10 @@ inline long long int atoll (const char* str)
#pragma warning(disable : 4201) // nameless union
#endif
+#if _MSC_VER >= 1900
+ #pragma warning(disable : 4464) // relative include path contains '..'
+#endif
+
#include <set>
#include <unordered_set>
#include <vector>
diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h
index d9982a3af..06869e590 100644
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -46,6 +46,11 @@
#ifndef __INTERMEDIATE_H
#define __INTERMEDIATE_H
+#if _MSC_VER >= 1900
+ #pragma warning( disable : 4464 ) // relative include path contains '..'
+ #pragma warning( disable : 5026 ) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted
+#endif
+
#include "../Include/Common.h"
#include "../Include/Types.h"
#include "../Include/ConstantUnion.h"
--
GitLab