Merge pull request #20742 from hrydgard/bump-stuff

hrydgard · web-flow · commit 804ef50896b1 · 2025-08-24T17:37:28.000+02:00
Update libzstd, rcheevos to latest
diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp
@@ -24,8 +24,6 @@
 #include "ext/rcheevos/include/rc_api_info.h"
 #include "ext/rcheevos/include/rc_api_request.h"
 #include "ext/rcheevos/include/rc_api_runtime.h"
-#include "ext/rcheevos/include/rc_api_user.h"
-#include "ext/rcheevos/include/rc_url.h"
 
 #include "ext/rapidjson/include/rapidjson/document.h"
 
diff --git a/UWP/libzstd_UWP/libzstd_UWP.vcxproj b/UWP/libzstd_UWP/libzstd_UWP.vcxproj
@@ -67,6 +67,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\ext\zstd\lib\compress\zstd_preSplit.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="..\..\ext\zstd\lib\common\error_private.h" />
@@ -114,6 +115,7 @@
     <ClCompile Include="..\..\ext\zstd\lib\compress\zstd_ldm.c" />
     <ClCompile Include="..\..\ext\zstd\lib\compress\zstd_opt.c" />
     <ClCompile Include="..\..\ext\zstd\lib\compress\zstdmt_compress.c" />
+    <ClCompile Include="..\..\ext\zstd\lib\compress\zstd_preSplit.c" />
     <ClCompile Include="..\..\ext\zstd\lib\decompress\huf_decompress.c" />
     <ClCompile Include="..\..\ext\zstd\lib\decompress\zstd_ddict.c" />
     <ClCompile Include="..\..\ext\zstd\lib\decompress\zstd_decompress.c" />
diff --git a/UWP/libzstd_UWP/libzstd_UWP.vcxproj.filters b/UWP/libzstd_UWP/libzstd_UWP.vcxproj.filters
@@ -31,6 +31,7 @@
     <ClCompile Include="..\..\ext\zstd\lib\dictBuilder\divsufsort.c" />
     <ClCompile Include="..\..\ext\zstd\lib\dictBuilder\fastcover.c" />
     <ClCompile Include="..\..\ext\zstd\lib\dictBuilder\zdict.c" />
+    <ClCompile Include="..\..\ext\zstd\lib\compress\zstd_preSplit.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -57,5 +58,6 @@
     <ClInclude Include="..\..\ext\zstd\lib\compress\zstd_opt.h" />
     <ClInclude Include="..\..\ext\zstd\lib\compress\zstdmt_compress.h" />
     <ClInclude Include="..\..\ext\zstd\lib\decompress\zstd_ddict.h" />
+    <ClInclude Include="..\..\ext\zstd\lib\compress\zstd_preSplit.h" />
   </ItemGroup>
 </Project>
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -858,6 +858,7 @@ LIBZSTD_FILES := \
   $(SRC)/ext/zstd/lib/compress/zstd_lazy.c \
   $(SRC)/ext/zstd/lib/compress/zstd_ldm.c \
   $(SRC)/ext/zstd/lib/compress/zstd_opt.c \
+  $(SRC)/ext/zstd/lib/compress/zstd_preSplit.c \
   $(SRC)/ext/zstd/lib/compress/zstdmt_compress.c \
   $(SRC)/ext/zstd/lib/decompress/huf_decompress.c \
   $(SRC)/ext/zstd/lib/decompress/zstd_ddict.c \
diff --git a/ext/libzstd.vcxproj b/ext/libzstd.vcxproj
@@ -48,6 +48,7 @@
     <ClCompile Include="zstd\lib\compress\zstd_opt.c" />
     <ClCompile Include="zstd\lib\compress\zstd_ldm.c" />
     <ClCompile Include="zstd\lib\compress\zstdmt_compress.c" />
+    <ClCompile Include="zstd\lib\compress\zstd_preSplit.c" />
     <ClCompile Include="zstd\lib\decompress\huf_decompress.c" />
     <ClCompile Include="zstd\lib\decompress\zstd_decompress.c" />
     <ClCompile Include="zstd\lib\decompress\zstd_decompress_block.c" />
@@ -69,6 +70,7 @@
     <ClInclude Include="zstd\lib\common\threading.h" />
     <ClInclude Include="zstd\lib\common\bitstream.h" />
     <ClInclude Include="zstd\lib\common\error_private.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_preSplit.h" />
     <ClInclude Include="zstd\lib\zstd_errors.h" />
     <ClInclude Include="zstd\lib\common\mem.h" />
     <ClInclude Include="zstd\lib\common\fse.h" />
diff --git a/ext/rcheevos b/ext/rcheevos
@@ -1 +1 @@
-Subproject commit ef0e22bc076235315b94499bbd9f799a3c781708
+Subproject commit b443902b1cdfee5a66b09fec20a94d2d2afaf2ec
diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt
@@ -35,7 +35,7 @@ set(ALL_SOURCE_FILES
 	${SRC_DIR}/rcheevos/runtime_progress.c
 	${SRC_DIR}/rcheevos/trigger.c
 	${SRC_DIR}/rcheevos/value.c
-	# rhash (still need just md5)
+	# rhash (still need just md5, hash)
 	${SRC_DIR}/rhash/md5.c
 	${SRC_DIR}/rhash/md5.h
 	)
diff --git a/ext/rcheevos-build/rcheevos.vcxproj b/ext/rcheevos-build/rcheevos.vcxproj
@@ -69,7 +69,6 @@
     <ClInclude Include="..\rcheevos\include\rc_hash.h" />
     <ClInclude Include="..\rcheevos\include\rc_runtime.h" />
     <ClInclude Include="..\rcheevos\include\rc_runtime_types.h" />
-    <ClInclude Include="..\rcheevos\include\rc_url.h" />
     <ClInclude Include="..\rcheevos\include\rc_util.h" />
     <ClInclude Include="..\rcheevos\src\rapi\rc_api_common.h" />
     <ClInclude Include="..\rcheevos\src\rcheevos\rc_internal.h" />
diff --git a/ext/rcheevos-build/rcheevos.vcxproj.filters b/ext/rcheevos-build/rcheevos.vcxproj.filters
@@ -125,9 +125,6 @@
     <ClInclude Include="..\rcheevos\include\rc_runtime_types.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\rcheevos\include\rc_url.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\rcheevos\include\rcheevos.h">
       <Filter>include</Filter>
     </ClInclude>
diff --git a/ext/zstd b/ext/zstd
@@ -1 +1 @@
-Subproject commit 794ea1b0afca0f020f4e57b6732332231fb23c70
+Subproject commit f8745da6ff1ad1e7bab384bd1f9d742439278e99
diff --git a/ext/zstd-build/CMakeLists.txt b/ext/zstd-build/CMakeLists.txt
@@ -24,6 +24,7 @@ set(ALL_SOURCE_FILES
 	${SRC_DIR}/compress/zstd_lazy.c
 	${SRC_DIR}/compress/zstd_ldm.c
 	${SRC_DIR}/compress/zstd_opt.c
+	${SRC_DIR}/compress/zstd_preSplit.c
 	${SRC_DIR}/compress/zstdmt_compress.c
 	${SRC_DIR}/decompress/huf_decompress.c
 	${SRC_DIR}/decompress/zstd_ddict.c
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
@@ -999,7 +999,7 @@ SOURCES_CXX += \
 	$(COMMONDIR)/GPU/D3D11/D3D11Loader.cpp \
 	$(COMMONDIR)/GPU/D3D11/thin3d_d3d11.cpp
 
-INCFLAGS += -I$(CORE_DIR)/dx9sdk/Include -I$(CORE_DIR)/dx9sdk/Include/DX11
+INCFLAGS += -I$(CORE_DIR)/dx9sdk/Include/DX11
 
 endif
 
@@ -1029,6 +1029,7 @@ SOURCES_C +=   $(ZSTDDIR)/common/debug.c \
                $(ZSTDDIR)/compress/zstd_lazy.c \
                $(ZSTDDIR)/compress/zstd_ldm.c \
                $(ZSTDDIR)/compress/zstd_opt.c \
+               $(ZSTDDIR)/compress/zstd_preSplit.c \
                $(ZSTDDIR)/compress/zstdmt_compress.c \
                $(ZSTDDIR)/decompress/huf_decompress.c \
                $(ZSTDDIR)/decompress/zstd_ddict.c \

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ set(ALL_SOURCE_FILES`
`35`	`35`	`${SRC_DIR}/rcheevos/runtime_progress.c`
`36`	`36`	`${SRC_DIR}/rcheevos/trigger.c`
`37`	`37`	`${SRC_DIR}/rcheevos/value.c`
`38`		`- # rhash (still need just md5)`
	`38`	`+ # rhash (still need just md5, hash)`
`39`	`39`	`${SRC_DIR}/rhash/md5.c`
`40`	`40`	`${SRC_DIR}/rhash/md5.h`
`41`	`41`	`)`