Merge branch 'master' into vulkan

2021-09-12 14:10:36 +03:00
parent 9bb104b354 6241b4f907
commit ecccd02f8a
161 changed files with 3359 additions and 1562 deletions
--- a/src/xenia/gpu/premake5.lua
+++ b/src/xenia/gpu/premake5.lua
@@ -36,7 +36,7 @@ project("xenia-gpu-shader-compiler")
  })
  files({
    "shader_compiler_main.cc",
-    "../base/main_"..platform_suffix..".cc",
+    "../base/console_app_main_"..platform_suffix..".cc",
  })

  filter("platforms:Windows")