Merge pull request #18900 from hrydgard/rcheevos-bump

Update rcheevos submodule
hrydgard · Feb 28, 2024 · 0159102 · 0159102
2 parents bc18fb1 + a584279
commit 0159102
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 16 deletions.
diff --git 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
@@ -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>
+</Project>
diff --git 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>
+</Project>
diff --git 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 b/ext/rcheevos
diff --git 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/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
@@ -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">

diff --git 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
+23 −0		CHANGELOG.md
+14 −0		include/rc_client.h
+5 −1		include/rc_client_raintegration.h
+0 −22		include/rc_hash.h
+3 −0		src/rapi/rc_api_common.c
+51 −21		src/rc_client.c
+4 −10		src/rc_client_internal.h
+32 −5		src/rc_client_raintegration.c
+4 −0		src/rc_client_raintegration_internal.h
+26 −1		src/rc_compat.c
+1 −1		src/rc_version.h
+0 −480		src/rhash/aes.c
+0 −49		src/rhash/aes.h
+2 −664		src/rhash/hash.c
+0 −1		test/Makefile
+60 −0		test/rapi/test_rc_api_common.c
+0 −2		test/rcheevos-test.vcxproj
+3 −0		test/rcheevos/test_format.c
+1 −1		test/rhash/test_hash.c
+86 −0		test/test_rc_client.c
+26 −0		test/test_rc_client_raintegration.c