Move SysConf to Core

It's not common code that could be reused for, say, Citra;
it's absolutely specific to Wii emulation and only used by the Dolphin
core, so let's move it there.

Another reason for doing this is to avoid having Common depend on Core.
This commit is contained in:
Léo Lam 2018-03-11 11:43:54 +01:00
parent 0856d4a68a
commit a287bbc3bd
16 changed files with 14 additions and 14 deletions

View File

@ -34,7 +34,6 @@ add_library(common
SettingsHandler.cpp SettingsHandler.cpp
StringUtil.cpp StringUtil.cpp
SymbolDB.cpp SymbolDB.cpp
SysConf.cpp
Thread.cpp Thread.cpp
Timer.cpp Timer.cpp
TraversalClient.cpp TraversalClient.cpp

View File

@ -147,7 +147,6 @@
<ClInclude Include="StringUtil.h" /> <ClInclude Include="StringUtil.h" />
<ClInclude Include="Swap.h" /> <ClInclude Include="Swap.h" />
<ClInclude Include="SymbolDB.h" /> <ClInclude Include="SymbolDB.h" />
<ClInclude Include="SysConf.h" />
<ClInclude Include="Thread.h" /> <ClInclude Include="Thread.h" />
<ClInclude Include="Timer.h" /> <ClInclude Include="Timer.h" />
<ClInclude Include="TraversalClient.h" /> <ClInclude Include="TraversalClient.h" />
@ -203,7 +202,6 @@
<ClCompile Include="SettingsHandler.cpp" /> <ClCompile Include="SettingsHandler.cpp" />
<ClCompile Include="StringUtil.cpp" /> <ClCompile Include="StringUtil.cpp" />
<ClCompile Include="SymbolDB.cpp" /> <ClCompile Include="SymbolDB.cpp" />
<ClCompile Include="SysConf.cpp" />
<ClCompile Include="Thread.cpp" /> <ClCompile Include="Thread.cpp" />
<ClCompile Include="Timer.cpp" /> <ClCompile Include="Timer.cpp" />
<ClCompile Include="TraversalClient.cpp" /> <ClCompile Include="TraversalClient.cpp" />

View File

@ -67,7 +67,6 @@
<ClInclude Include="StringUtil.h" /> <ClInclude Include="StringUtil.h" />
<ClInclude Include="Swap.h" /> <ClInclude Include="Swap.h" />
<ClInclude Include="SymbolDB.h" /> <ClInclude Include="SymbolDB.h" />
<ClInclude Include="SysConf.h" />
<ClInclude Include="Thread.h" /> <ClInclude Include="Thread.h" />
<ClInclude Include="Timer.h" /> <ClInclude Include="Timer.h" />
<ClInclude Include="Version.h" /> <ClInclude Include="Version.h" />
@ -289,7 +288,6 @@
<ClCompile Include="SettingsHandler.cpp" /> <ClCompile Include="SettingsHandler.cpp" />
<ClCompile Include="StringUtil.cpp" /> <ClCompile Include="StringUtil.cpp" />
<ClCompile Include="SymbolDB.cpp" /> <ClCompile Include="SymbolDB.cpp" />
<ClCompile Include="SysConf.cpp" />
<ClCompile Include="Thread.cpp" /> <ClCompile Include="Thread.cpp" />
<ClCompile Include="Timer.cpp" /> <ClCompile Include="Timer.cpp" />
<ClCompile Include="Version.cpp" /> <ClCompile Include="Version.cpp" />

View File

@ -16,6 +16,7 @@ add_library(core
NetPlayServer.cpp NetPlayServer.cpp
PatchEngine.cpp PatchEngine.cpp
State.cpp State.cpp
SysConf.cpp
TitleDatabase.cpp TitleDatabase.cpp
WiiRoot.cpp WiiRoot.cpp
WiiUtils.cpp WiiUtils.cpp

View File

@ -8,7 +8,7 @@
#include <variant> #include <variant>
#include "Common/Config/Config.h" #include "Common/Config/Config.h"
#include "Common/SysConf.h" #include "Core/SysConf.h"
namespace Config namespace Config
{ {

View File

@ -17,13 +17,13 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/SysConf.h"
#include "Core/Config/SYSCONFSettings.h" #include "Core/Config/SYSCONFSettings.h"
#include "Core/ConfigLoaders/IsSettingSaveable.h" #include "Core/ConfigLoaders/IsSettingSaveable.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/IOS/IOS.h" #include "Core/IOS/IOS.h"
#include "Core/IOS/USB/Bluetooth/BTBase.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/SysConf.h"
namespace ConfigLoaders namespace ConfigLoaders
{ {

View File

@ -292,6 +292,7 @@
<ClCompile Include="PowerPC\PPCTables.cpp" /> <ClCompile Include="PowerPC\PPCTables.cpp" />
<ClCompile Include="PowerPC\Profiler.cpp" /> <ClCompile Include="PowerPC\Profiler.cpp" />
<ClCompile Include="State.cpp" /> <ClCompile Include="State.cpp" />
<ClCompile Include="SysConf.cpp" />
<ClCompile Include="TitleDatabase.cpp" /> <ClCompile Include="TitleDatabase.cpp" />
<ClCompile Include="WiiRoot.cpp" /> <ClCompile Include="WiiRoot.cpp" />
<ClCompile Include="WiiUtils.cpp" /> <ClCompile Include="WiiUtils.cpp" />
@ -530,6 +531,7 @@
<ClInclude Include="PowerPC\PPCTables.h" /> <ClInclude Include="PowerPC\PPCTables.h" />
<ClInclude Include="PowerPC\Profiler.h" /> <ClInclude Include="PowerPC\Profiler.h" />
<ClInclude Include="State.h" /> <ClInclude Include="State.h" />
<ClInclude Include="SysConf.h" />
<ClInclude Include="Titles.h" /> <ClInclude Include="Titles.h" />
<ClInclude Include="TitleDatabase.h" /> <ClInclude Include="TitleDatabase.h" />
<ClInclude Include="WiiRoot.h" /> <ClInclude Include="WiiRoot.h" />

View File

@ -179,6 +179,7 @@
<ClCompile Include="NetPlayServer.cpp" /> <ClCompile Include="NetPlayServer.cpp" />
<ClCompile Include="PatchEngine.cpp" /> <ClCompile Include="PatchEngine.cpp" />
<ClCompile Include="State.cpp" /> <ClCompile Include="State.cpp" />
<ClCompile Include="SysConf.cpp" />
<ClCompile Include="TitleDatabase.cpp" /> <ClCompile Include="TitleDatabase.cpp" />
<ClCompile Include="WiiRoot.cpp" /> <ClCompile Include="WiiRoot.cpp" />
<ClCompile Include="WiiUtils.cpp" /> <ClCompile Include="WiiUtils.cpp" />
@ -912,6 +913,7 @@
<ClInclude Include="NetPlayServer.h" /> <ClInclude Include="NetPlayServer.h" />
<ClInclude Include="PatchEngine.h" /> <ClInclude Include="PatchEngine.h" />
<ClInclude Include="State.h" /> <ClInclude Include="State.h" />
<ClInclude Include="SysConf.h" />
<ClInclude Include="Titles.h" /> <ClInclude Include="Titles.h" />
<ClInclude Include="TitleDatabase.h" /> <ClInclude Include="TitleDatabase.h" />
<ClInclude Include="WiiRoot.h" /> <ClInclude Include="WiiRoot.h" />

View File

@ -13,7 +13,7 @@
#include "Common/File.h" #include "Common/File.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/SysConf.h" #include "Core/SysConf.h"
namespace IOS namespace IOS
{ {

View File

@ -15,7 +15,6 @@
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/SysConf.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/Debugger/Debugger_SymbolMap.h"
@ -25,6 +24,7 @@
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/IOS/IOS.h" #include "Core/IOS/IOS.h"
#include "Core/SysConf.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace IOS namespace IOS

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/SysConf.h" #include "Core/SysConf.h"
#include <algorithm> #include <algorithm>
#include <array> #include <array>

View File

@ -11,11 +11,11 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/SysConf.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/IOS/IOS.h" #include "Core/IOS/IOS.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/NetPlayClient.h" #include "Core/NetPlayClient.h"
#include "Core/SysConf.h"
namespace Core namespace Core
{ {

View File

@ -29,13 +29,13 @@
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Swap.h" #include "Common/Swap.h"
#include "Common/SysConf.h"
#include "Core/CommonTitles.h" #include "Core/CommonTitles.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/ES.h"
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IOS/IOS.h" #include "Core/IOS/IOS.h"
#include "Core/SysConf.h"
#include "DiscIO/DiscExtractor.h" #include "DiscIO/DiscExtractor.h"
#include "DiscIO/Enums.h" #include "DiscIO/Enums.h"
#include "DiscIO/Filesystem.h" #include "DiscIO/Filesystem.h"

View File

@ -39,7 +39,6 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/SysConf.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
#include "Core/Config/NetplaySettings.h" #include "Core/Config/NetplaySettings.h"
@ -48,6 +47,7 @@
#include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/DVD/DVDInterface.h"
#include "Core/HW/WiiSaveCrypted.h" #include "Core/HW/WiiSaveCrypted.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/SysConf.h"
#include "Core/TitleDatabase.h" #include "Core/TitleDatabase.h"
#include "Core/WiiUtils.h" #include "Core/WiiUtils.h"
#include "DiscIO/Blob.h" #include "DiscIO/Blob.h"

View File

@ -24,10 +24,10 @@
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/SysConf.h"
#include "Core/Config/SYSCONFSettings.h" #include "Core/Config/SYSCONFSettings.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/SysConf.h"
#include "DolphinWX/DolphinSlider.h" #include "DolphinWX/DolphinSlider.h"
#include "DolphinWX/Frame.h" #include "DolphinWX/Frame.h"
#include "DolphinWX/Main.h" #include "DolphinWX/Main.h"