summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorRiver City Ransomware <richyateswebdesign@gmail.com>2018-01-20 01:36:09 +0100
committerbunnei <bunneidev@gmail.com>2018-01-20 01:36:09 +0100
commitc8a094e164b77fdae6b4b8bff7f94b703c24c161 (patch)
tree7f1f70cec7f189c022b9ed5dc03c4996d21e54ca /src/core/core.cpp
parentAdded CreateSharedMemory & UNIMPLEMENTED() for non existent services. (#113) (diff)
downloadyuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.gz
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.bz2
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.lz
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.xz
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.zst
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index ae1eb2430..0ba44b111 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -5,7 +5,9 @@
#include <memory>
#include <utility>
#include "common/logging/log.h"
+#ifdef ARCHITECTURE_x86_64
#include "core/arm/dynarmic/arm_dynarmic.h"
+#endif
#include "core/arm/unicorn/arm_unicorn.h"
#include "core/core.h"
#include "core/core_timing.h"
@@ -144,7 +146,12 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
break;
case Settings::CpuCore::Dynarmic:
default:
+#ifdef ARCHITECTURE_x86_64
cpu_core = std::make_unique<ARM_Dynarmic>();
+#else
+ cpu_core = std::make_unique<ARM_Unicorn>();
+ LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
+#endif
break;
}