From 245937eb85b15ece98f4ca75bf1d20256c726d73 Mon Sep 17 00:00:00 2001
From: TheLastRar <TheLastRar@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:56:54 +0100
Subject: [PATCH] 3rdparty/cpuinfo: Fix ARM64 project

---
 3rdparty/cpuinfo/cpuinfo.vcxproj         | 15 +++++++++------
 3rdparty/cpuinfo/cpuinfo.vcxproj.filters | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/3rdparty/cpuinfo/cpuinfo.vcxproj b/3rdparty/cpuinfo/cpuinfo.vcxproj
index 51abf08160..42b8c0af4d 100644
--- a/3rdparty/cpuinfo/cpuinfo.vcxproj
+++ b/3rdparty/cpuinfo/cpuinfo.vcxproj
@@ -30,13 +30,16 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\cache.c">
+    <ClCompile Include="src\arm\cache.c">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\uarch.c">
+    <ClCompile Include="src\arm\uarch.c">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\init.c">
+    <ClCompile Include="src\arm\windows\init-by-logical-sys-info.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\arm\windows\init.c">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="deps\clog\src\clog.c" />
@@ -78,13 +81,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\api.h">
+    <ClInclude Include="src\arm\api.h">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\midr.h">
+    <ClInclude Include="src\arm\midr.h">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\api.h">
+    <ClInclude Include="src\arm\windows\windows-arm-init.h">
       <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="deps\clog\include\clog.h" />
diff --git a/3rdparty/cpuinfo/cpuinfo.vcxproj.filters b/3rdparty/cpuinfo/cpuinfo.vcxproj.filters
index 5f8ce245fc..f02f55f6a5 100644
--- a/3rdparty/cpuinfo/cpuinfo.vcxproj.filters
+++ b/3rdparty/cpuinfo/cpuinfo.vcxproj.filters
@@ -63,13 +63,16 @@
     <ClCompile Include="deps\clog\src\clog.c">
       <Filter>clog</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\cache.c">
+    <ClCompile Include="src\arm\cache.c">
       <Filter>arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\uarch.c">
+    <ClCompile Include="src\arm\uarch.c">
       <Filter>arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\init.c">
+    <ClCompile Include="src\arm\windows\init.c">
+      <Filter>arm\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="src\arm\windows\init-by-logical-sys-info.c">
       <Filter>arm\windows</Filter>
     </ClCompile>
   </ItemGroup>
@@ -99,13 +102,13 @@
     <ClInclude Include="deps\clog\include\clog.h">
       <Filter>clog</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\api.h">
+    <ClInclude Include="src\arm\api.h">
       <Filter>arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\midr.h">
+    <ClInclude Include="src\arm\midr.h">
       <Filter>arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\api.h">
+    <ClInclude Include="src\arm\windows\windows-arm-init.h">
       <Filter>arm\windows</Filter>
     </ClInclude>
   </ItemGroup>