summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-01-26 05:30:35 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2015-01-26 05:30:35 -0600
commit7df55d220f8cd699f47a3b51ebc808554f6fbd7a (patch)
tree9a46d9f442c1961afe77d4c934f4ff9bf57c97fc /Source/Core
parent53a9df10f9d7a53bce947a0fdc43e6d3c482bf86 (diff)
parentde070cfe8bd90a838be452b8a6a45363fad94525 (diff)
Merge pull request #1967 from Sonicadvance1/Android_settings
[Android] Change some configuration options.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/ConfigManager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 1ad45b2083..b2af3599d3 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -542,6 +542,8 @@ void SConfig::LoadCoreSettings(IniFile& ini)
core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_JIT64);
#elif _M_ARM_32
core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_JITARM);
+#elif _M_ARM_64
+ core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_JITARM64);
#else
core->Get("CPUCore", &m_LocalCoreStartupParameter.iCPUCore, SCoreStartupParameter::CORE_INTERPRETER);
#endif