summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-27 05:01:40 +0200
committerbunnei <bunneidev@gmail.com>2018-03-27 05:02:37 +0200
commit94f4009c3be4c7f69eda8af1cb0139dccd5bffa5 (patch)
tree170c0dad6412df2d55594593de65460ed56b5c45 /src/core/core.cpp
parentconfig: Rename is_docked to use_docked_mode to be consistent with other config bools. (diff)
downloadyuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.gz
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.bz2
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.lz
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.xz
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.tar.zst
yuzu-94f4009c3be4c7f69eda8af1cb0139dccd5bffa5.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index d55621de8..11654d4da 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -148,19 +148,15 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
current_process = Kernel::Process::Create("main");
- switch (Settings::values.cpu_core) {
- case Settings::CpuCore::Unicorn:
- cpu_core = std::make_shared<ARM_Unicorn>();
- break;
- case Settings::CpuCore::Dynarmic:
- default:
+ if (Settings::values.use_cpu_jit) {
#ifdef ARCHITECTURE_x86_64
cpu_core = std::make_shared<ARM_Dynarmic>();
#else
cpu_core = std::make_shared<ARM_Unicorn>();
LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
#endif
- break;
+ } else {
+ cpu_core = std::make_shared<ARM_Unicorn>();
}
gpu_core = std::make_unique<Tegra::GPU>();