Merge branch 'master' into vulkan

This commit is contained in:
Triang3l 2021-09-12 14:10:36 +03:00
commit ecccd02f8a
161 changed files with 3359 additions and 1562 deletions

View file

@ -189,6 +189,12 @@ filter("platforms:Windows")
"bcrypt",
})
-- Embed the manifest for things like dependencies and DPI awareness.
filter({"platforms:Windows", "kind:ConsoleApp or WindowedApp"})
files({
"src/xenia/base/app_win32.manifest"
})
-- Create scratch/ path
if not os.isdir("scratch") then
os.mkdir("scratch")
@ -242,9 +248,13 @@ workspace("xenia")
include("third_party/SDL2.lua")
end
-- Disable treating warnings as fatal errors for all third party projects:
-- Disable treating warnings as fatal errors for all third party projects, as
-- well as other things relevant only to Xenia itself.
for _, prj in ipairs(premake.api.scope.current.solution.projects) do
project(prj.name)
removefiles({
"src/xenia/base/app_win32.manifest"
})
removeflags({
"FatalWarnings",
})