From 9028866b7fb03f55eab117d2107573075725b0f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 24 Aug 2025 14:46:53 +0200
Subject: [PATCH] Update libzstd

---
 UWP/libzstd_UWP/libzstd_UWP.vcxproj         | 2 ++
 UWP/libzstd_UWP/libzstd_UWP.vcxproj.filters | 2 ++
 android/jni/Android.mk                      | 1 +
 ext/libzstd.vcxproj                         | 2 ++
 ext/zstd                                    | 2 +-
 ext/zstd-build/CMakeLists.txt               | 1 +
 libretro/Makefile.common                    | 3 ++-
 7 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/UWP/libzstd_UWP/libzstd_UWP.vcxproj b/UWP/libzstd_UWP/libzstd_UWP.vcxproj
index 3c853aa36d..4a25eae2ce 100644
--- 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
index 1a22172909..f67796ac19 100644
--- 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>
\ No newline at end of file
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 55f67d7d15..aa551d1152 100644
--- 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
index f7f910af4c..a437886731 100644
--- 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/zstd b/ext/zstd
index 794ea1b0af..f8745da6ff 160000
--- 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
index 16b41c4406..1f65a3f070 100644
--- 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
index 604727db4c..aa1de6dc51 100644
--- 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 \