diff options
| author | River City Ransomware <richyateswebdesign@gmail.com> | 2018-01-19 19:36:09 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-19 19:36:09 -0500 |
| commit | c8a094e164b77fdae6b4b8bff7f94b703c24c161 (patch) | |
| tree | 7f1f70cec7f189c022b9ed5dc03c4996d21e54ca /src/core/core.cpp | |
| parent | 0b6da0c1abaa34a082b627dfe909b6651d8b6fee (diff) | |
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.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index ae1eb2430d..0ba44b1113 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; } |