Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2018-11-25 12:44:30 +03:00
commit beebed4ca2
10 changed files with 347 additions and 199 deletions

View file

@ -128,10 +128,6 @@ filter({"platforms:Linux", "toolset:gcc"})
end
filter({"platforms:Linux", "language:C++", "toolset:clang"})
buildoptions({
"-std=c++14",
"-stdlib=libstdc++",
})
links({
"c++",
"c++abi"
@ -139,6 +135,11 @@ filter({"platforms:Linux", "language:C++", "toolset:clang"})
disablewarnings({
"deprecated-register"
})
filter({"platforms:Linux", "language:C++", "toolset:clang", "files:*.cc or *.cpp"})
buildoptions({
"-std=c++14",
"-stdlib=libstdc++",
})
filter("platforms:Windows")
system("windows")