Browse Source

Fixing VS build.

Branimir Karadžić 7 years ago
parent
commit
aa0a432f9f
2 changed files with 4 additions and 1 deletions
  1. 1 1
      3rdparty/spirv-tools/source/opt/constants.h
  2. 3 0
      scripts/shaderc.lua

+ 1 - 1
3rdparty/spirv-tools/source/opt/constants.h

@@ -15,7 +15,7 @@
 #ifndef SOURCE_OPT_CONSTANTS_H_
 #ifndef SOURCE_OPT_CONSTANTS_H_
 #define SOURCE_OPT_CONSTANTS_H_
 #define SOURCE_OPT_CONSTANTS_H_
 
 
-#include <cinttypes>
+#include <cstdint>
 #include <map>
 #include <map>
 #include <memory>
 #include <memory>
 #include <unordered_map>
 #include <unordered_map>

+ 3 - 0
scripts/shaderc.lua

@@ -181,16 +181,19 @@ project "glslang"
 	configuration { "vs*" }
 	configuration { "vs*" }
 		buildoptions {
 		buildoptions {
 			"/wd4005", -- warning C4005: '_CRT_SECURE_NO_WARNINGS': macro redefinition
 			"/wd4005", -- warning C4005: '_CRT_SECURE_NO_WARNINGS': macro redefinition
+			"/wd4065", -- warning C4065: switch statement contains 'default' but no 'case' labels
 			"/wd4100", -- warning C4100: 'inclusionDepth' : unreferenced formal parameter
 			"/wd4100", -- warning C4100: 'inclusionDepth' : unreferenced formal parameter
 			"/wd4127", -- warning C4127: conditional expression is constant
 			"/wd4127", -- warning C4127: conditional expression is constant
 			"/wd4189", -- warning C4189: 'isFloat': local variable is initialized but not referenced
 			"/wd4189", -- warning C4189: 'isFloat': local variable is initialized but not referenced
 			"/wd4244", -- warning C4244: '=': conversion from 'int' to 'char', possible loss of data
 			"/wd4244", -- warning C4244: '=': conversion from 'int' to 'char', possible loss of data
 			"/wd4310", -- warning C4310: cast truncates constant value
 			"/wd4310", -- warning C4310: cast truncates constant value
+			"/wd4389", -- warning C4389: '==': signed/unsigned mismatch
 			"/wd4456", -- warning C4456: declaration of 'feature' hides previous local declaration
 			"/wd4456", -- warning C4456: declaration of 'feature' hides previous local declaration
 			"/wd4457", -- warning C4457: declaration of 'token' hides function parameter
 			"/wd4457", -- warning C4457: declaration of 'token' hides function parameter
 			"/wd4458", -- warning C4458: declaration of 'language' hides class member
 			"/wd4458", -- warning C4458: declaration of 'language' hides class member
 			"/wd4702", -- warning C4702: unreachable code
 			"/wd4702", -- warning C4702: unreachable code
 			"/wd4715", -- warning C4715: 'spv::Builder::makeFpConstant': not all control paths return a value
 			"/wd4715", -- warning C4715: 'spv::Builder::makeFpConstant': not all control paths return a value
+			"/wd4838", -- warning C4838: conversion from 'spv::GroupOperation' to 'unsigned int' requires a narrowing conversion
 		}
 		}
 
 
 	configuration { "mingw* or linux or osx" }
 	configuration { "mingw* or linux or osx" }