From 4514afd79995c008e41bf36c42e686296758acfc Mon Sep 17 00:00:00 2001
From: Amber Brault <celestialamber1@gmail.com>
Date: Mon, 9 Dec 2024 19:14:24 -0500
Subject: [PATCH] Move to Common folder to make CMakeList files cleaner

---
 Source/Core/Common/CMakeLists.txt                             | 2 ++
 Source/Core/{Core/PowerPC => Common}/CWDemangler.cpp          | 2 +-
 Source/Core/{Core/PowerPC => Common}/CWDemangler.h            | 0
 Source/Core/Common/SymbolDB.cpp                               | 2 +-
 Source/Core/Core/CMakeLists.txt                               | 2 --
 Source/Core/DolphinLib.props                                  | 4 ++--
 Source/UnitTests/{Core/PowerPC => Common}/CWDemanglerTest.cpp | 2 +-
 Source/UnitTests/UnitTests.vcxproj                            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename Source/Core/{Core/PowerPC => Common}/CWDemangler.cpp (99%)
 rename Source/Core/{Core/PowerPC => Common}/CWDemangler.h (100%)
 rename Source/UnitTests/{Core/PowerPC => Common}/CWDemanglerTest.cpp (99%)

diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 81431e564c..edfb49cbf2 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -45,6 +45,8 @@ add_library(common
   Crypto/HMAC.h
   Crypto/SHA1.cpp
   Crypto/SHA1.h
+  CWDemangler.cpp
+  CWDemangler.h
   Debug/MemoryPatches.cpp
   Debug/MemoryPatches.h
   Debug/Threads.h
diff --git a/Source/Core/Core/PowerPC/CWDemangler.cpp b/Source/Core/Common/CWDemangler.cpp
similarity index 99%
rename from Source/Core/Core/PowerPC/CWDemangler.cpp
rename to Source/Core/Common/CWDemangler.cpp
index 8ea551687b..2925e3dbb2 100644
--- a/Source/Core/Core/PowerPC/CWDemangler.cpp
+++ b/Source/Core/Common/CWDemangler.cpp
@@ -1,4 +1,4 @@
-#include "Core/PowerPC/CWDemangler.h"
+#include "Common/CWDemangler.h"
 
 #include <cctype>
 #include <map>
diff --git a/Source/Core/Core/PowerPC/CWDemangler.h b/Source/Core/Common/CWDemangler.h
similarity index 100%
rename from Source/Core/Core/PowerPC/CWDemangler.h
rename to Source/Core/Common/CWDemangler.h
diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp
index 3b5557ebb4..fb3ef68586 100644
--- a/Source/Core/Common/SymbolDB.cpp
+++ b/Source/Core/Common/SymbolDB.cpp
@@ -10,7 +10,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Core/PowerPC/CWDemangler.h"
+#include "Common/CWDemangler.h"
 
 namespace Common
 {
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 482590100f..4704b340b2 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -488,8 +488,6 @@ add_library(core
   PowerPC/CachedInterpreter/CachedInterpreterEmitter.h
   PowerPC/ConditionRegister.cpp
   PowerPC/ConditionRegister.h
-  PowerPC/CWDemangler.cpp
-  PowerPC/CWDemangler.h
   PowerPC/Expression.cpp
   PowerPC/Expression.h
   PowerPC/Interpreter/ExceptionUtils.h
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 0600dcab44..22e71904ef 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -44,6 +44,7 @@
     <ClInclude Include="Common\Crypto\ec.h" />
     <ClInclude Include="Common\Crypto\HMAC.h" />
     <ClInclude Include="Common\Crypto\SHA1.h" />
+    <ClInclude Include="Common\CWDemangler.h" />
     <ClInclude Include="Common\Debug\MemoryPatches.h" />
     <ClInclude Include="Common\Debug\Threads.h" />
     <ClInclude Include="Common\Debug\Watches.h" />
@@ -433,7 +434,6 @@
     <ClInclude Include="Core\PowerPC\CachedInterpreter\CachedInterpreterEmitter.h" />
     <ClInclude Include="Core\PowerPC\ConditionRegister.h" />
     <ClInclude Include="Core\PowerPC\CPUCoreBase.h" />
-    <ClInclude Include="Core\PowerPC\CWDemangler.h" />
     <ClInclude Include="Core\PowerPC\Expression.h" />
     <ClInclude Include="Core\PowerPC\GDBStub.h" />
     <ClInclude Include="Core\PowerPC\Gekko.h" />
@@ -796,6 +796,7 @@
     <ClCompile Include="Common\Crypto\ec.cpp" />
     <ClCompile Include="Common\Crypto\HMAC.cpp" />
     <ClCompile Include="Common\Crypto\SHA1.cpp" />
+    <ClCompile Include="Common\CWDemangler.cpp" />
     <ClCompile Include="Common\Debug\MemoryPatches.cpp" />
     <ClCompile Include="Common\Debug\Watches.cpp" />
     <ClCompile Include="Common\DynamicLibrary.cpp" />
@@ -1096,7 +1097,6 @@
     <ClCompile Include="Core\PowerPC\CachedInterpreter\CachedInterpreterBlockCache.cpp" />
     <ClCompile Include="Core\PowerPC\CachedInterpreter\CachedInterpreterEmitter.cpp" />
     <ClCompile Include="Core\PowerPC\ConditionRegister.cpp" />
-    <ClCompile Include="Core\PowerPC\CWDemangler.cpp" />
     <ClCompile Include="Core\PowerPC\Expression.cpp" />
     <ClCompile Include="Core\PowerPC\GDBStub.cpp" />
     <ClCompile Include="Core\PowerPC\Interpreter\Interpreter_Branch.cpp" />
diff --git a/Source/UnitTests/Core/PowerPC/CWDemanglerTest.cpp b/Source/UnitTests/Common/CWDemanglerTest.cpp
similarity index 99%
rename from Source/UnitTests/Core/PowerPC/CWDemanglerTest.cpp
rename to Source/UnitTests/Common/CWDemanglerTest.cpp
index 6c606f50ac..3a57b3c22e 100644
--- a/Source/UnitTests/Core/PowerPC/CWDemanglerTest.cpp
+++ b/Source/UnitTests/Common/CWDemanglerTest.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <tuple>
 
-#include "Core/PowerPC/CWDemangler.h"
+#include "Common/CWDemangler.h"
 
 void DoDemangleTemplateArgsTest(std::string mangled, std::string name, std::string templateArgs)
 {
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index e0d5935905..f293798bc6 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -46,6 +46,7 @@
     <ClCompile Include="Common\CommonFuncsTest.cpp" />
     <ClCompile Include="Common\Crypto\EcTest.cpp" />
     <ClCompile Include="Common\Crypto\SHA1Test.cpp" />
+    <ClCompile Include="Common\CWDemanglerTest.cpp" />
     <ClCompile Include="Common\EnumFormatterTest.cpp" />
     <ClCompile Include="Common\EventTest.cpp" />
     <ClCompile Include="Common\FileUtilTest.cpp" />
@@ -71,7 +72,6 @@
     <ClCompile Include="Core\MMIOTest.cpp" />
     <ClCompile Include="Core\PageFaultTest.cpp" />
     <ClCompile Include="Core\PatchAllowlistTest.cpp" />
-    <ClCompile Include="Core\PowerPC\CWDemanglerTest.cpp" />
     <ClCompile Include="Core\PowerPC\DivUtilsTest.cpp" />
     <ClCompile Include="VideoCommon\VertexLoaderTest.cpp" />
     <ClCompile Include="StubHost.cpp" />