From 0783498f570e7d5c00174cd10a3c1ff105d1eae6 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 25 Oct 2014 12:54:44 -0700
Subject: Use configuration files to enable or disable the new dyncom
 interpreter.

---
 src/citra/config.cpp    | 6 ++++++
 src/citra/config.h      | 1 +
 src/citra/default_ini.h | 3 +++
 3 files changed, 10 insertions(+)

(limited to 'src/citra')

diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 03a0ce60..3e5e986c 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -7,6 +7,7 @@
 #include "citra/default_ini.h"
 #include "common/file_util.h"
 #include "core/settings.h"
+#include "core/core.h"
 
 #include "config.h"
 
@@ -55,6 +56,10 @@ void Config::ReadControls() {
     Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT);
 }
 
+void Config::ReadCore() {
+    Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter);
+}
+
 void Config::ReadData() {
     Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true);
 }
@@ -62,6 +67,7 @@ void Config::ReadData() {
 void Config::Reload() {
     LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file);
     ReadControls();
+    ReadCore();
     ReadData();
 }
 
diff --git a/src/citra/config.h b/src/citra/config.h
index c4fac245..4f655187 100644
--- a/src/citra/config.h
+++ b/src/citra/config.h
@@ -16,6 +16,7 @@ class Config {
 
     bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true);
     void ReadControls();
+    void ReadCore();
     void ReadData();
 public:
     Config();
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index e7e45f4a..4a016d48 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -26,6 +26,9 @@ pad_sdown =
 pad_sleft =
 pad_sright =
 
+[Core]
+cpu_core = ## 0: Interpreter (default), 1: DynCom Interpreter
+
 [Data Storage]
 use_virtual_sd =
 )";
-- 
cgit v1.2.3