From 0f97180ee1def4e6a1924e30005f04d823ebbf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 28 Feb 2024 11:26:33 +0700
Subject: [PATCH 1/2] Update rcheevos.

While doing so, switch to a fork with 3DS hashing support removed.
---
 .gitmodules                                   | 2 +-
 UWP/rcheevos_UWP/rcheevos_UWP.vcxproj         | 3 +--
 UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters | 5 +----
 ext/rcheevos                                  | 2 +-
 ext/rcheevos-build/CMakeLists.txt             | 1 -
 libretro/Makefile.common                      | 1 -
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 7ab10b0ec98a..6b64143ea837 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,7 +46,7 @@
 	url = https://github.com/google/cpu_features.git
 [submodule "ext/rcheevos"]
 	path = ext/rcheevos
-	url = https://github.com/RetroAchievements/rcheevos.git
+	url = https://github.com/hrydgard/rcheevos.git
 [submodule "ext/naett"]
 	path = ext/naett
 	url = https://github.com/erkkah/naett.git
diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
index 579eb8942aa9..9094e1bed2d3 100644
--- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
+++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
@@ -72,7 +72,6 @@
     <ClCompile Include="..\..\ext\rcheevos\src\rcheevos\runtime_progress.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rcheevos\trigger.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rcheevos\value.c" />
-    <ClCompile Include="..\..\ext\rcheevos\src\rhash\aes.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rhash\cdreader.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rhash\hash.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rhash\md5.c" />
@@ -129,4 +128,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
index d1cf70526569..b1f493b0e12a 100644
--- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
+++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
@@ -155,8 +155,5 @@
     <ClCompile Include="..\..\ext\rcheevos\src\rc_util.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\rcheevos\src\rhash\aes.c">
-      <Filter>rhash</Filter>
-    </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ext/rcheevos b/ext/rcheevos
index e7989c300280..88a671e3091b 160000
--- a/ext/rcheevos
+++ b/ext/rcheevos
@@ -1 +1 @@
-Subproject commit e7989c300280ba06d7621ae5b4e00ac7fe28d97a
+Subproject commit 88a671e3091b8a02cdda136d4de0345524fd2387
diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt
index 52748c82e86a..5638df375054 100644
--- a/ext/rcheevos-build/CMakeLists.txt
+++ b/ext/rcheevos-build/CMakeLists.txt
@@ -38,7 +38,6 @@ set(ALL_SOURCE_FILES
 	# rhash
 	${SRC_DIR}/rhash/cdreader.c
 	${SRC_DIR}/rhash/hash.c
-	${SRC_DIR}/rhash/aes.c
 	${SRC_DIR}/rhash/md5.c
 	${SRC_DIR}/rhash/md5.h
 	)
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 611be9130aa0..1bcd8ab2b91c 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -220,7 +220,6 @@ SOURCES_C += \
 	$(EXTDIR)/rcheevos/src/rcheevos/runtime_progress.c \
 	$(EXTDIR)/rcheevos/src/rcheevos/trigger.c \
 	$(EXTDIR)/rcheevos/src/rcheevos/value.c \
-	$(EXTDIR)/rcheevos/src/rhash/aes.c \
 	$(EXTDIR)/rcheevos/src/rhash/cdreader.c \
 	$(EXTDIR)/rcheevos/src/rhash/hash.c \
 	$(EXTDIR)/rcheevos/src/rhash/md5.c

From a5842792b8403ed2cfb9a93ce1275be674cf29bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 28 Feb 2024 15:45:20 +0700
Subject: [PATCH 2/2] Buildfix

---
 android/jni/Android.mk                      | 3 +--
 ext/rcheevos-build/rcheevos.vcxproj         | 1 -
 ext/rcheevos-build/rcheevos.vcxproj.filters | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index e4e6838e7fcf..32e53bf59900 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -134,8 +134,7 @@ RCHEEVOS_FILES := \
   ${SRC}/ext/rcheevos/src/rcheevos/value.c \
   ${SRC}/ext/rcheevos/src/rhash/cdreader.c \
   ${SRC}/ext/rcheevos/src/rhash/hash.c \
-  ${SRC}/ext/rcheevos/src/rhash/md5.c \
-  ${SRC}/ext/rcheevos/src/rhash/aes.c
+  ${SRC}/ext/rcheevos/src/rhash/md5.c
 
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 	ADRENOTOOLS_FILES := \
diff --git a/ext/rcheevos-build/rcheevos.vcxproj b/ext/rcheevos-build/rcheevos.vcxproj
index 89815baee3f6..70af3d7c65aa 100644
--- a/ext/rcheevos-build/rcheevos.vcxproj
+++ b/ext/rcheevos-build/rcheevos.vcxproj
@@ -57,7 +57,6 @@
     <ClCompile Include="..\rcheevos\src\rc_client.c" />
     <ClCompile Include="..\rcheevos\src\rc_compat.c" />
     <ClCompile Include="..\rcheevos\src\rc_util.c" />
-    <ClCompile Include="..\rcheevos\src\rhash\aes.c" />
     <ClCompile Include="..\rcheevos\src\rhash\cdreader.c" />
     <ClCompile Include="..\rcheevos\src\rhash\hash.c" />
     <ClCompile Include="..\rcheevos\src\rhash\md5.c" />
diff --git a/ext/rcheevos-build/rcheevos.vcxproj.filters b/ext/rcheevos-build/rcheevos.vcxproj.filters
index f3f501c45638..6151abfe7e26 100644
--- a/ext/rcheevos-build/rcheevos.vcxproj.filters
+++ b/ext/rcheevos-build/rcheevos.vcxproj.filters
@@ -90,9 +90,6 @@
     <ClCompile Include="..\rcheevos\src\rc_util.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="..\rcheevos\src\rhash\aes.c">
-      <Filter>rhash</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\rcheevos\src\rapi\rc_api_common.h">