Config: Integrate

2017-05-13 22:29:55 +01:00
parent 1548a15c68
commit 41afe78a44
5 changed files with 33 additions and 0 deletions
@@ -7,6 +7,7 @@
 #include <array>
 #include <bitset>

+#include "Core/Config/Config.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
@@ -36,6 +37,7 @@ public:
  ScopeInit()
  {
    Core::DeclareAsCPUThread();
+    Config::Init();
    SConfig::Init();
    PowerPC::Init(PowerPC::CORE_INTERPRETER);
    CoreTiming::Init();
@@ -45,6 +47,7 @@ public:
    CoreTiming::Shutdown();
    PowerPC::Shutdown();
    SConfig::Shutdown();
+    Config::Shutdown();
    Core::UndeclareAsCPUThread();
  }
 };