From 9555563ad28cb28bff6ba10965f7b38f1ba84409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 18 Jan 2024 00:15:22 +0100
Subject: [PATCH] Update rcheevos yet again

---
 UWP/rcheevos_UWP/rcheevos_UWP.vcxproj         | 9 ++++++---
 UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters | 5 ++++-
 android/jni/Android.mk                        | 3 ++-
 ext/rcheevos                                  | 2 +-
 ext/rcheevos-build/CMakeLists.txt             | 1 +
 ext/rcheevos-build/rcheevos.vcxproj           | 1 +
 ext/rcheevos-build/rcheevos.vcxproj.filters   | 3 +++
 libretro/Makefile.common                      | 1 +
 8 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
index 5a210d97ae66..579eb8942aa9 100644
--- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
+++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
@@ -72,6 +72,7 @@
     <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" />
@@ -100,8 +101,10 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
-  <ImportGroup Label="Shared"></ImportGroup>
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -126,4 +129,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
index b1f493b0e12a..d1cf70526569 100644
--- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
+++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
@@ -155,5 +155,8 @@
     <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>
+</Project>
\ No newline at end of file
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 36a8e4c46e69..196a3de1cff6 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -134,7 +134,8 @@ 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/md5.c \
+  ${SRC}/ext/rcheevos/src/rhash/aes.c
 
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 	ADRENOTOOLS_FILES := \
diff --git a/ext/rcheevos b/ext/rcheevos
index 6fb3ebca22fe..e7989c300280 160000
--- a/ext/rcheevos
+++ b/ext/rcheevos
@@ -1 +1 @@
-Subproject commit 6fb3ebca22fe4f3a97e7a391e5e9c4623aa2286a
+Subproject commit e7989c300280ba06d7621ae5b4e00ac7fe28d97a
diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt
index 5638df375054..52748c82e86a 100644
--- a/ext/rcheevos-build/CMakeLists.txt
+++ b/ext/rcheevos-build/CMakeLists.txt
@@ -38,6 +38,7 @@ 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/ext/rcheevos-build/rcheevos.vcxproj b/ext/rcheevos-build/rcheevos.vcxproj
index 70af3d7c65aa..89815baee3f6 100644
--- a/ext/rcheevos-build/rcheevos.vcxproj
+++ b/ext/rcheevos-build/rcheevos.vcxproj
@@ -57,6 +57,7 @@
     <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 6151abfe7e26..f3f501c45638 100644
--- a/ext/rcheevos-build/rcheevos.vcxproj.filters
+++ b/ext/rcheevos-build/rcheevos.vcxproj.filters
@@ -90,6 +90,9 @@
     <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">
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 169ac3c8169c..9538c75fd701 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -220,6 +220,7 @@ 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