Discord Rich Presence CMake integration

I have no idea if this works or not. Hopefully the build bot will tell me.

Source/Core/Core/CMakeLists.txt

@@ -29,6 +29,7 @@ add_library(core
   Config/MainSettings.cpp
   Config/NetplaySettings.cpp
   Config/SYSCONFSettings.cpp
+  Config/UISettings.cpp
   ConfigLoaders/BaseConfigLoader.cpp
   ConfigLoaders/GameConfigLoader.cpp
   ConfigLoaders/IsSettingSaveable.cpp

Source/Core/Core/Config/UISettings.cpp

@@ -0,0 +1,14 @@
+// Copyright 2018 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included
+
+#include "Core/Config/UISettings.h"
+
+namespace Config
+{
+// UI.General
+
+const ConfigInfo<bool> MAIN_USE_DISCORD_PRESENCE{{System::Main, "General", "UseDiscordPresence"},
+                                                 true};
+
+}  // namespace Config

Source/Core/Core/Config/UISettings.h

@@ -0,0 +1,21 @@
+// Copyright 2018 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/Config/Config.h"
+
+// This is a temporary soluation, although they should be in their repected cpp file in UICommon.
+// However, in order for IsSettingSaveable to commpile without some issues, this needs to be here.
+// Once IsSettingSaveable is removed, then you should able to move these back to UICommon.
+
+namespace Config
+{
+// Configuration Information
+
+// UI.General
+
+extern const ConfigInfo<bool> MAIN_USE_DISCORD_PRESENCE;
+
+}  // namespace Config

Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp

@@ -9,7 +9,7 @@
 
 #include "Common/Config/Config.h"
 #include "Core/Config/GraphicsSettings.h"
-#include "UICommon/DiscordPresence.h"
+#include "Core/Config/UISettings.h"
 
 namespace ConfigLoaders
 {
@@ -116,9 +116,9 @@ bool IsSettingSaveable(const Config::ConfigLocation& config_location)
 
       Config::GFX_PERF_QUERIES_ENABLE.location,
 
-      // Main.General
+      // UI.General
 
-      MAIN_USE_DISCORD_PRESENCE.location,
+      Config::MAIN_USE_DISCORD_PRESENCE.location,
 
   };
 

Source/Core/Core/Core.vcxproj

@@ -48,6 +48,7 @@
     <ClCompile Include="Config\GraphicsSettings.cpp" />
     <ClCompile Include="Config\MainSettings.cpp" />
     <ClCompile Include="Config\NetplaySettings.cpp" />
+    <ClCompile Include="Config\UISettings.cpp" />
     <ClCompile Include="Config\SYSCONFSettings.cpp" />
     <ClCompile Include="ConfigLoaders\BaseConfigLoader.cpp" />
     <ClCompile Include="ConfigLoaders\GameConfigLoader.cpp" />
@@ -316,6 +317,7 @@
     <ClInclude Include="ConfigLoaders\MovieConfigLoader.h" />
     <ClInclude Include="ConfigLoaders\NetPlayConfigLoader.h" />
     <ClInclude Include="ConfigManager.h" />
+    <ClInclude Include="Config\UISettings.h" />
     <ClInclude Include="Core.h" />
     <ClInclude Include="CoreTiming.h" />
     <ClInclude Include="Debugger\Debugger_SymbolMap.h" />
@@ -592,4 +594,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/Core/Core.vcxproj.filters

@@ -898,6 +898,9 @@
     <ClCompile Include="IOS\Network\NCD\WiiNetConfig.cpp">
       <Filter>IOS\Network\NCD</Filter>
     </ClCompile>
+    <ClCompile Include="Config\UISettings.cpp">
+      <Filter>Config</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BootManager.h" />
@@ -1580,8 +1583,11 @@
     <ClInclude Include="HW\WiimoteCommon\WiimoteReport.h">
       <Filter>HW %28Flipper/Hollywood%29\WiimoteCommon</Filter>
     </ClInclude>
+    <ClInclude Include="Config\UISettings.h">
+      <Filter>Config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>