mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing VS build.

This commit is contained in:
Branimir Karadžić 2016-12-15 20:46:12 -08:00
parent 566171eacc
commit 1531cc29dc
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp vendored
View File

@ -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>

2
scripts/shaderc.lua
View File

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

3
tools/shaderc/shaderc_spirv.cpp
View File

@ -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
{