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

src/xenia/cpu/ppc/testing/ppc_testing_main.cc

@@ -15,13 +15,16 @@
 #include "xenia/base/math.h"
 #include "xenia/base/platform.h"
 #include "xenia/base/string_buffer.h"
-#include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/cpu_flags.h"
 #include "xenia/cpu/ppc/ppc_context.h"
 #include "xenia/cpu/ppc/ppc_frontend.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/cpu/raw_module.h"
 
+#if XE_ARCH_AMD64
+#include "xenia/cpu/backend/x64/x64_backend.h"
+#endif  // XE_ARCH
+
 #if XE_COMPILER_MSVC
 #include "xenia/base/platform_win.h"
 #endif  // XE_COMPILER_MSVC
@@ -196,17 +199,17 @@ class TestRunner {
 
     std::unique_ptr<xe::cpu::backend::Backend> backend;
     if (!backend) {
-#if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
+#if XE_ARCH_AMD64
       if (cvars::cpu == "x64") {
         backend.reset(new xe::cpu::backend::x64::X64Backend());
       }
-#endif  // XENIA_HAS_X64_BACKEND
+#endif  // XE_ARCH
       if (cvars::cpu == "any") {
-#if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
         if (!backend) {
+#if XE_ARCH_AMD64
           backend.reset(new xe::cpu::backend::x64::X64Backend());
+#endif  // XE_ARCH
         }
-#endif  // XENIA_HAS_X64_BACKEND
       }
     }
 

src/xenia/cpu/ppc/testing/premake5.lua

@@ -11,7 +11,6 @@ project("xenia-cpu-ppc-tests")
     "fmt",
     "mspack",
     "xenia-core",
-    "xenia-cpu-backend-x64",
     "xenia-cpu",
     "xenia-base",
   })
@@ -24,6 +23,10 @@ project("xenia-cpu-ppc-tests")
   })
   filter("files:*.s")
     flags({"ExcludeFromBuild"})
+  filter("architecture:x86_64")
+    links({
+      "xenia-cpu-backend-x64",
+    })
   filter("platforms:Windows")
     debugdir(project_root)
     debugargs({