Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed VS build.

Browse Source
This commit is contained in:
Branimir Karadžić
2016-12-15 20:53:13 -08:00
parent 1531cc29dc
commit 99415e419b
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

24
scripts/shaderc.lua
View File

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