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/app/premake5.lua
+++ b/src/xenia/app/premake5.lua
@@ -50,8 +50,8 @@ project("xenia-app")
  local_platform_files()
  files({
    "xenia_main.cc",
-    "../base/main_"..platform_suffix..".cc",
    "../base/main_init_"..platform_suffix..".cc",
+    "../ui/windowed_app_main_"..platform_suffix..".cc",
  })

  resincludedirs({
@@ -71,7 +71,6 @@ project("xenia-app")
      "X11",
      "xcb",
      "X11-xcb",
-      "vulkan",
      "SDL2",
    })