Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

2022-07-10 10:50:39 +02:00
parent d33be73f3d b41bb35a20
commit 1d00372e6b
49 changed files with 2378 additions and 1159 deletions
--- a/src/xenia/app/premake5.lua
+++ b/src/xenia/app/premake5.lua
@@ -15,7 +15,6 @@ project("xenia-app")
    "xenia-base",
    "xenia-core",
    "xenia-cpu",
-    "xenia-cpu-backend-x64",
    "xenia-debug-ui",
    "xenia-gpu",
    "xenia-gpu-null",
@@ -60,6 +59,11 @@ project("xenia-app")
    project_root,
  })

+  filter("architecture:x86_64")
+    links({
+      "xenia-cpu-backend-x64",
+    })
+
  filter("platforms:Windows")
    files({
      "main_resources.rc",