1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 0240f946b..e5f299f26 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -140,8 +140,16 @@ void System::Reschedule() {
 System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
     LOG_DEBUG(HW_Memory, "initialized OK");
 
-    // TODO: Configuration option
-    cpu_core = std::make_unique<ARM_Dynarmic>();
+    switch (Settings::values.cpu_core) {
+    case Settings::CpuCore::Unicorn:
+        cpu_core = std::make_unique<ARM_Unicorn>();
+        break;
+    case Settings::CpuCore::Dynarmic:
+    default:
+        cpu_core = std::make_unique<ARM_Dynarmic>();
+        break;
+    }
+
     telemetry_session = std::make_unique<Core::TelemetrySession>();
 
     CoreTiming::Init();