Merge branch 'master' into vulkan

1 files changed, 11 insertions, 1 deletions

diff --git a/premake5.lua b/premake5.lua
index 8ea9ce93c..3c2c9d49d 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -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",
     })