summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar River City Ransomware2018-01-19 19:36:09 -0500
committerGravatar bunnei2018-01-19 19:36:09 -0500
commitc8a094e164b77fdae6b4b8bff7f94b703c24c161 (patch)
tree7f1f70cec7f189c022b9ed5dc03c4996d21e54ca /src/core/core.cpp
parentAdded CreateSharedMemory & UNIMPLEMENTED() for non existent services. (#113) (diff)
downloadyuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.gz
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.xz
yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.zip
Port citra #3352 to yuzu (#103)
* Port citra #3352 to yuzu This change allows non x86_64 architectures to compile yuzu by skipping the building of dynarmic * Fixed clang-format errors * fixes more clang-format errors
Diffstat (limited to 'src/core/core.cpp')
-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 @@
5#include <memory> 5#include <memory>
6#include <utility> 6#include <utility>
7#include "common/logging/log.h" 7#include "common/logging/log.h"
8#ifdef ARCHITECTURE_x86_64
8#include "core/arm/dynarmic/arm_dynarmic.h" 9#include "core/arm/dynarmic/arm_dynarmic.h"
10#endif
9#include "core/arm/unicorn/arm_unicorn.h" 11#include "core/arm/unicorn/arm_unicorn.h"
10#include "core/core.h" 12#include "core/core.h"
11#include "core/core_timing.h" 13#include "core/core_timing.h"
@@ -144,7 +146,12 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
144 break; 146 break;
145 case Settings::CpuCore::Dynarmic: 147 case Settings::CpuCore::Dynarmic:
146 default: 148 default:
149#ifdef ARCHITECTURE_x86_64
147 cpu_core = std::make_unique<ARM_Dynarmic>(); 150 cpu_core = std::make_unique<ARM_Dynarmic>();
151#else
152 cpu_core = std::make_unique<ARM_Unicorn>();
153 LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
154#endif
148 break; 155 break;
149 } 156 }
150 157