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

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",

src/xenia/app/xenia_main.cc

@@ -477,7 +477,7 @@ void EmulatorApp::EmulatorThread() {
   // Setup and initialize all subsystems. If we can't do something
   // (unsupported system, memory issues, etc) this will fail early.
   X_STATUS result = emulator_->Setup(
-      emulator_window_->window(), emulator_window_->imgui_drawer(),
+      emulator_window_->window(), emulator_window_->imgui_drawer(), true,
       CreateAudioSystem, CreateGraphicsSystem, CreateInputDrivers);
   if (XFAILED(result)) {
     XELOGE("Failed to setup emulator: {:08X}", result);