diff --git a/UWP/libchdr_UWP/libchdr_UWP.vcxproj b/UWP/libchdr_UWP/libchdr_UWP.vcxproj
index 428f5ce874..b54dc12541 100644
--- a/UWP/libchdr_UWP/libchdr_UWP.vcxproj
+++ b/UWP/libchdr_UWP/libchdr_UWP.vcxproj
@@ -27,22 +27,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -89,9 +84,9 @@
false
false
- ..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)
+ ..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-24.05\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)
NotUsing
- _7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)
+ Z7_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)
Console
@@ -102,4 +97,4 @@
-
\ No newline at end of file
+
diff --git a/UWP/libchdr_UWP/libchdr_UWP.vcxproj.filters b/UWP/libchdr_UWP/libchdr_UWP.vcxproj.filters
index 7a49828f1d..7574c66db7 100644
--- a/UWP/libchdr_UWP/libchdr_UWP.vcxproj.filters
+++ b/UWP/libchdr_UWP/libchdr_UWP.vcxproj.filters
@@ -15,53 +15,38 @@
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
+
lzma
-
- lzma
-
-
- lzma
-
-
- lzma
-
-
- lzma
-
-
- lzma
-
-
+
lzma
-
\ No newline at end of file
+
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 61c6c126b8..5987d02894 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -4,24 +4,20 @@ SRC := ../..
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Locals.mk
-LOCAL_CFLAGS += -D_7ZIP_ST -D__SWITCH__
+LOCAL_CFLAGS += -DZ7_ST -D__SWITCH__
LZMA_FILES := \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Alloc.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2Enc.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra86.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/CpuArch.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Delta.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFind.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFindOpt.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaDec.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaEnc.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Dec.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Enc.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaLib.c \
- $(SRC)/ext/libchdr/deps/lzma-22.01/src/Sort.c
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/Alloc.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/Bra.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/Bra86.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/BraIA64.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/CpuArch.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/Delta.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/LzFind.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/LzmaDec.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/LzmaEnc.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/Lzma86Dec.c \
+ $(SRC)/ext/libchdr/deps/lzma-24.05/src/Sort.c
CHDR_FILES := \
${LZMA_FILES} \
@@ -79,7 +75,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Locals.mk
-LOCAL_CFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DHAVE_DLFCN_H -DRC_DISABLE_LUA -D_7ZIP_ST
+LOCAL_CFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DHAVE_DLFCN_H -DRC_DISABLE_LUA -DZ7_ST
# http://software.intel.com/en-us/articles/getting-started-on-optimizing-ndk-project-for-multiple-cpu-architectures
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index bda2abd416..6d3b83f52b 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../ext/armips \
$(LOCAL_PATH)/../../ext/armips/ext/filesystem/include \
$(LOCAL_PATH)/../../ext/armips/ext/tinyformat \
- $(LOCAL_PATH)/../../ext/libchdr/deps/lzma-22.01/include \
+ $(LOCAL_PATH)/../../ext/libchdr/deps/lzma-24.05/include \
$(LOCAL_PATH)/../../ext/libchdr/include \
$(LOCAL_PATH)/../../ext/cpu_features/include \
$(LOCAL_PATH)/../../ext/rcheevos/include \
diff --git a/ext/libchdr b/ext/libchdr
index 26d27ca490..8bba7745d7 160000
--- a/ext/libchdr
+++ b/ext/libchdr
@@ -1 +1 @@
-Subproject commit 26d27ca4903aaccd3ef41337b29bf5ecafb1f0ca
+Subproject commit 8bba7745d758627258b315997a860039244cedaf
diff --git a/ext/libchdr-build/CMakeLists.txt b/ext/libchdr-build/CMakeLists.txt
index ce3d3aba29..bde9ed8a4c 100644
--- a/ext/libchdr-build/CMakeLists.txt
+++ b/ext/libchdr-build/CMakeLists.txt
@@ -1,34 +1,30 @@
cmake_minimum_required (VERSION 3.10.0)
project (chdr)
-set(LZMA_DIR ../libchdr/deps/lzma-22.01/src)
+set(LZMA_DIR ../libchdr/deps/lzma-24.05/src)
set(SRC_DIR ../libchdr/src)
-include_directories(../libchdr/deps/lzma-22.01/include)
+include_directories(../libchdr/deps/lzma-24.05/include)
include_directories(../libchdr/include)
include_directories(../zlib)
include_directories(../zstd/lib)
-add_definitions(-D_7ZIP_ST)
+add_definitions(-DZ7_ST)
# Hack - CpuArch.c has a workaround that we reuse.
add_definitions(-D__SWITCH__)
set(ALL_SOURCE_FILES
${LZMA_DIR}/Alloc.c
- ${LZMA_DIR}/Bcj2.c
- ${LZMA_DIR}/Bcj2Enc.c
${LZMA_DIR}/Bra.c
${LZMA_DIR}/Bra86.c
+ ${LZMA_DIR}/BraIA64.c
${LZMA_DIR}/CpuArch.c
${LZMA_DIR}/Delta.c
${LZMA_DIR}/LzFind.c
- ${LZMA_DIR}/LzFindOpt.c
${LZMA_DIR}/LzmaDec.c
${LZMA_DIR}/LzmaEnc.c
${LZMA_DIR}/Lzma86Dec.c
- ${LZMA_DIR}/Lzma86Enc.c
- ${LZMA_DIR}/LzmaLib.c
${LZMA_DIR}/Sort.c
${SRC_DIR}/libchdr_bitstream.c
${SRC_DIR}/libchdr_cdrom.c
diff --git a/ext/libchdr.vcxproj b/ext/libchdr.vcxproj
index 74b1aecef5..34737fb634 100644
--- a/ext/libchdr.vcxproj
+++ b/ext/libchdr.vcxproj
@@ -35,27 +35,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -190,14 +200,14 @@
Level4
- _7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebug
true
ProgramDatabase
false
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -210,13 +220,13 @@
Level4
- _7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
true
ProgramDatabase
false
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -228,13 +238,13 @@
Level4
- _7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
true
ProgramDatabase
false
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -246,13 +256,13 @@
Level4
- _7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
true
ProgramDatabase
false
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -267,7 +277,7 @@
MaxSpeed
true
true
- _7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
false
MultiThreaded
true
@@ -277,7 +287,7 @@
true
false
StreamingSIMDExtensions2
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -295,7 +305,7 @@
MaxSpeed
true
true
- _7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
false
false
MultiThreaded
@@ -305,7 +315,7 @@
true
AnySuitable
Speed
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -322,7 +332,7 @@
MaxSpeed
true
true
- _7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
false
false
MultiThreaded
@@ -332,7 +342,7 @@
true
AnySuitable
Speed
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -349,7 +359,7 @@
MaxSpeed
true
true
- _7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
false
false
MultiThreaded
@@ -359,7 +369,7 @@
true
AnySuitable
Speed
- libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;
+ libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;
Windows
@@ -371,4 +381,4 @@
-
\ No newline at end of file
+
diff --git a/ext/libchdr.vcxproj.filters b/ext/libchdr.vcxproj.filters
index d35dd7e48f..3efa31b66e 100644
--- a/ext/libchdr.vcxproj.filters
+++ b/ext/libchdr.vcxproj.filters
@@ -6,52 +6,37 @@
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
+
LZMA
-
- LZMA
-
-
- LZMA
-
-
- LZMA
-
-
- LZMA
-
-
- LZMA
-
-
+
LZMA
@@ -63,6 +48,51 @@
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
+
+ LZMA
+
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 148f5ab113..a537a988d7 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -268,25 +268,21 @@ SOURCES_C += \
COREFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024
COREFLAGS += -DHTTPS_NOT_AVAILABLE
-COREFLAGS += -D_7ZIP_ST
-INCFLAGS += -I$(EXTDIR)/libchdr/deps/lzma-22.01/include
+COREFLAGS += -DZ7_ST
+INCFLAGS += -I$(EXTDIR)/libchdr/deps/lzma-24.05/include
SOURCES_C += \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Alloc.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Bcj2.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Bcj2Enc.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Bra.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Bra86.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/CpuArch.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Delta.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/LzFind.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/LzFindOpt.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/LzmaDec.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/LzmaEnc.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Lzma86Dec.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Lzma86Enc.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/LzmaLib.c \
- $(EXTDIR)/libchdr/deps/lzma-22.01/src/Sort.c
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/Alloc.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/Bra.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/Bra86.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/BraIA64.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/CpuArch.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/Delta.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/LzFind.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/LzmaDec.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/LzmaEnc.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/Lzma86Dec.c \
+ $(EXTDIR)/libchdr/deps/lzma-24.05/src/Sort.c
INCFLAGS += -I$(EXTDIR)/libchdr/include