INSANEMODE/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2025-06-10 03:58:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Port citra #3352 to yuzu (#103)

Browse Source 
* 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
This commit is contained in:
River City Ransomware
2018-01-19 19:36:09 -05:00
committed by bunnei
parent 0b6da0c1ab
commit c8a094e164
4 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/core.cpp
View File

@ -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;
}