diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 4ef3af3ac5..714be0f0f1 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -34,7 +34,6 @@ add_library(common SettingsHandler.cpp StringUtil.cpp SymbolDB.cpp - SysConf.cpp Thread.cpp Timer.cpp TraversalClient.cpp diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 5b64898b7b..05a86d667c 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -147,7 +147,6 @@ - @@ -203,7 +202,6 @@ - diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 58b75ff30f..8dd8bd6aeb 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -67,7 +67,6 @@ - @@ -289,7 +288,6 @@ - diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index d42c959bc1..8bb45737b9 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(core NetPlayServer.cpp PatchEngine.cpp State.cpp + SysConf.cpp TitleDatabase.cpp WiiRoot.cpp WiiUtils.cpp diff --git a/Source/Core/Core/Config/SYSCONFSettings.h b/Source/Core/Core/Config/SYSCONFSettings.h index f4ade3ddf8..2d1dd78e12 100644 --- a/Source/Core/Core/Config/SYSCONFSettings.h +++ b/Source/Core/Core/Config/SYSCONFSettings.h @@ -8,7 +8,7 @@ #include #include "Common/Config/Config.h" -#include "Common/SysConf.h" +#include "Core/SysConf.h" namespace Config { diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp index b652aa922b..8d6e00fe20 100644 --- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp @@ -17,13 +17,13 @@ #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/Logging/Log.h" -#include "Common/SysConf.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigLoaders/IsSettingSaveable.h" #include "Core/Core.h" #include "Core/IOS/IOS.h" #include "Core/IOS/USB/Bluetooth/BTBase.h" +#include "Core/SysConf.h" namespace ConfigLoaders { diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 641aaeaaab..3a1aeee2ea 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -292,6 +292,7 @@ + @@ -530,6 +531,7 @@ + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 5456cd4be5..25a151d371 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -179,6 +179,7 @@ + @@ -912,6 +913,7 @@ + diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp index c4770253d6..b1fadd8a1f 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp @@ -13,7 +13,7 @@ #include "Common/File.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" -#include "Common/SysConf.h" +#include "Core/SysConf.h" namespace IOS { diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp index e98fb9f35f..454eddc37b 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp @@ -15,7 +15,6 @@ #include "Common/MsgHandler.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" -#include "Common/SysConf.h" #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Debugger/Debugger_SymbolMap.h" @@ -25,6 +24,7 @@ #include "Core/Host.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" +#include "Core/SysConf.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" namespace IOS diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Core/SysConf.cpp similarity index 99% rename from Source/Core/Common/SysConf.cpp rename to Source/Core/Core/SysConf.cpp index 36ab4fa325..6efb18a729 100644 --- a/Source/Core/Common/SysConf.cpp +++ b/Source/Core/Core/SysConf.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/SysConf.h" +#include "Core/SysConf.h" #include #include diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Core/SysConf.h similarity index 100% rename from Source/Core/Common/SysConf.h rename to Source/Core/Core/SysConf.h diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp index cb87cc6dec..a705801fc1 100644 --- a/Source/Core/Core/WiiRoot.cpp +++ b/Source/Core/Core/WiiRoot.cpp @@ -11,11 +11,11 @@ #include "Common/Logging/Log.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" -#include "Common/SysConf.h" #include "Core/ConfigManager.h" #include "Core/IOS/IOS.h" #include "Core/Movie.h" #include "Core/NetPlayClient.h" +#include "Core/SysConf.h" namespace Core { diff --git a/Source/Core/Core/WiiUtils.cpp b/Source/Core/Core/WiiUtils.cpp index 91538a5bef..931c400d4b 100644 --- a/Source/Core/Core/WiiUtils.cpp +++ b/Source/Core/Core/WiiUtils.cpp @@ -29,13 +29,13 @@ #include "Common/NandPaths.h" #include "Common/StringUtil.h" #include "Common/Swap.h" -#include "Common/SysConf.h" #include "Core/CommonTitles.h" #include "Core/ConfigManager.h" #include "Core/IOS/Device.h" #include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/Formats.h" #include "Core/IOS/IOS.h" +#include "Core/SysConf.h" #include "DiscIO/DiscExtractor.h" #include "DiscIO/Enums.h" #include "DiscIO/Filesystem.h" diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 6c893bccf3..c0f7303e90 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -39,7 +39,6 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" -#include "Common/SysConf.h" #include "Common/Thread.h" #include "Core/Boot/Boot.h" #include "Core/Config/NetplaySettings.h" @@ -48,6 +47,7 @@ #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/WiiSaveCrypted.h" #include "Core/Movie.h" +#include "Core/SysConf.h" #include "Core/TitleDatabase.h" #include "Core/WiiUtils.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index ab9c983bb1..e3ad121d0c 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -24,10 +24,10 @@ #include "Common/Assert.h" #include "Common/FileUtil.h" -#include "Common/SysConf.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/SysConf.h" #include "DolphinWX/DolphinSlider.h" #include "DolphinWX/Frame.h" #include "DolphinWX/Main.h"