mirror of
https://github.com/xenia-project/xenia.git
synced 2026-04-04 14:17:24 +00:00
Merge branch 'master' into d3d12
This commit is contained in:
commit
beebed4ca2
10 changed files with 347 additions and 199 deletions
|
|
@ -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")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue