Bladeren bron

Fixing VS build.

Branimir Karadžić 9 jaren geleden
bovenliggende
commit
1531cc29dc

+ 2 - 0
3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp

@@ -79,7 +79,9 @@ 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>

+ 1 - 1
scripts/shaderc.lua

@@ -26,7 +26,7 @@ project "glslang"
 			"-Wno-unused-const-variable",
 		}
 
-	configuration { "not osx" }
+	configuration { "linux-*" }
 		buildoptions {
 			"-Wno-unused-but-set-variable",
 		}

+ 3 - 0
tools/shaderc/shaderc_spirv.cpp

@@ -5,11 +5,14 @@
 
 #include "shaderc.h"
 
+BX_PRAGMA_DIAGNOSTIC_PUSH()
+BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4265) // error C4265: 'spv::spirvbin_t': class has virtual functions, but destructor is not virtual
 #include <ShaderLang.h>
 #include <ResourceLimits.h>
 #include <SPIRV/SPVRemapper.h>
 //#include <spirv-tools/libspirv.hpp>
 //#include <spirv-tools/optimizer.hpp>
+BX_PRAGMA_DIAGNOSTIC_POP()
 
 namespace bgfx
 {