From 99415e419b596056f42542035096cba327eb1993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Thu, 15 Dec 2016 20:53:13 -0800
Subject: [PATCH] Fixed VS build.

---
 .../MachineIndependent/preprocessor/Pp.cpp    |  2 --
 scripts/shaderc.lua                           | 24 ++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp b/3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp
index 63416a754..3c6d01221 100644
--- a/3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp
@@ -79,9 +79,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // cpp.c
 //
 
-#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
-#endif // _CRT_SECURE_NO_WARNINGS
 
 #include <sstream>
 #include <cstdlib>
diff --git a/scripts/shaderc.lua b/scripts/shaderc.lua
index 1c955161e..721403f71 100644
--- a/scripts/shaderc.lua
+++ b/scripts/shaderc.lua
@@ -6,6 +6,11 @@
 project "glslang"
 	kind "StaticLib"
 
+	configuration { "vs*" }
+		buildoptions {
+			"/wd4005", -- warning C4005: '_CRT_SECURE_NO_WARNINGS': macro redefinition
+		}
+
 	configuration { "not vs*" }
 		buildoptions {
 			"-Wno-ignored-qualifiers",
@@ -55,12 +60,25 @@ project "glslang"
 	}
 
 	removefiles {
-		"../3rdparty/glslang/glslang/OSDependent/Windows/**.cpp",
-		"../3rdparty/glslang/glslang/OSDependent/Windows/**.h",
-
 		"../3rdparty/glsl-parser/main.cpp",
+		"../3rdparty/glslang/glslang/OSDependent/Unix/main.cpp",
+		"../3rdparty/glslang/glslang/OSDependent/Windows/main.cpp",
 	}
 
+	configuration { "windows" }
+		removefiles {
+			"../3rdparty/glslang/glslang/OSDependent/Unix/**.cpp",
+			"../3rdparty/glslang/glslang/OSDependent/Unix/**.h",
+		}
+
+	configuration { "not windows" }
+		removefiles {
+			"../3rdparty/glslang/glslang/OSDependent/Windows/**.cpp",
+			"../3rdparty/glslang/glslang/OSDependent/Windows/**.h",
+		}
+
+	configuration {}
+
 project "shaderc"
 	kind "ConsoleApp"