Skip to content

Commit c0301e7

Browse files
hrydgardhrydgard
committed
Merge pull request #20462 from hrydgard/upgrade-libchdr
Update libchdr to latest
1 parent 435b265 commit c0301e7

File tree

9 files changed

+157
-149
lines changed

9 files changed

+157
-149
lines changed

‎UWP/libchdr_UWP/libchdr_UWP.vcxproj

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,17 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<ItemGroup>
30-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Alloc.c" />
31-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2.c" />
32-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2Enc.c" />
33-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra.c" />
34-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra86.c" />
35-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\BraIA64.c" />
36-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\CpuArch.c" />
37-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Delta.c" />
38-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFind.c" />
39-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFindOpt.c" />
40-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Dec.c" />
41-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Enc.c" />
42-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaDec.c" />
43-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaEnc.c" />
44-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaLib.c" />
45-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Sort.c" />
30+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Alloc.c" />
31+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra.c" />
32+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra86.c" />
33+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\BraIA64.c" />
34+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\CpuArch.c" />
35+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Delta.c" />
36+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzFind.c" />
37+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Lzma86Dec.c" />
38+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaDec.c" />
39+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaEnc.c" />
40+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Sort.c" />
4641
<ClCompile Include="..\..\ext\libchdr\src\libchdr_bitstream.c" />
4742
<ClCompile Include="..\..\ext\libchdr\src\libchdr_cdrom.c" />
4843
<ClCompile Include="..\..\ext\libchdr\src\libchdr_chd.c" />
@@ -89,9 +84,9 @@
8984
<ClCompile>
9085
<CompileAsWinRT>false</CompileAsWinRT>
9186
<SDLCheck>false</SDLCheck>
92-
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-24.05\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9388
<PrecompiledHeader>NotUsing</PrecompiledHeader>
94-
<PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89+
<PreprocessorDefinitions>Z7_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9590
</ClCompile>
9691
<Link>
9792
<SubSystem>Console</SubSystem>
@@ -102,4 +97,4 @@
10297
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
10398
<ImportGroup Label="ExtensionTargets">
10499
</ImportGroup>
105-
</Project>
100+
</Project>

‎UWP/libchdr_UWP/libchdr_UWP.vcxproj.filters

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,53 +15,38 @@
1515
<ClCompile Include="..\..\ext\libchdr\src\libchdr_chd.c" />
1616
<ClCompile Include="..\..\ext\libchdr\src\libchdr_flac.c" />
1717
<ClCompile Include="..\..\ext\libchdr\src\libchdr_huffman.c" />
18-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Alloc.c">
18+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Alloc.c">
1919
<Filter>lzma</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2.c">
21+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra.c">
2222
<Filter>lzma</Filter>
2323
</ClCompile>
24-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2Enc.c">
24+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra86.c">
2525
<Filter>lzma</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra.c">
27+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\BraIA64.c">
2828
<Filter>lzma</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra86.c">
30+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\CpuArch.c">
3131
<Filter>lzma</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\BraIA64.c">
33+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Delta.c">
3434
<Filter>lzma</Filter>
3535
</ClCompile>
36-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\CpuArch.c">
36+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzFind.c">
3737
<Filter>lzma</Filter>
3838
</ClCompile>
39-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Delta.c">
39+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Lzma86Dec.c">
4040
<Filter>lzma</Filter>
4141
</ClCompile>
42-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFind.c">
42+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaDec.c">
4343
<Filter>lzma</Filter>
4444
</ClCompile>
45-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFindOpt.c">
45+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaEnc.c">
4646
<Filter>lzma</Filter>
4747
</ClCompile>
48-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Dec.c">
49-
<Filter>lzma</Filter>
50-
</ClCompile>
51-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Enc.c">
52-
<Filter>lzma</Filter>
53-
</ClCompile>
54-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaDec.c">
55-
<Filter>lzma</Filter>
56-
</ClCompile>
57-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaEnc.c">
58-
<Filter>lzma</Filter>
59-
</ClCompile>
60-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaLib.c">
61-
<Filter>lzma</Filter>
62-
</ClCompile>
63-
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Sort.c">
48+
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Sort.c">
6449
<Filter>lzma</Filter>
6550
</ClCompile>
6651
</ItemGroup>
67-
</Project>
52+
</Project>

‎android/jni/Android.mk

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,20 @@ SRC := ../..
44
include $(CLEAR_VARS)
55
include $(LOCAL_PATH)/Locals.mk
66

7-
LOCAL_CFLAGS += -D_7ZIP_ST -D__SWITCH__
7+
LOCAL_CFLAGS += -DZ7_ST -D__SWITCH__
88

99
LZMA_FILES := \
10-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Alloc.c \
11-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2.c \
12-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bcj2Enc.c \
13-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra.c \
14-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Bra86.c \
15-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/CpuArch.c \
16-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Delta.c \
17-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFind.c \
18-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzFindOpt.c \
19-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaDec.c \
20-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaEnc.c \
21-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Dec.c \
22-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Lzma86Enc.c \
23-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/LzmaLib.c \
24-
$(SRC)/ext/libchdr/deps/lzma-22.01/src/Sort.c
10+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/Alloc.c \
11+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/Bra.c \
12+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/Bra86.c \
13+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/BraIA64.c \
14+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/CpuArch.c \
15+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/Delta.c \
16+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/LzFind.c \
17+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/LzmaDec.c \
18+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/LzmaEnc.c \
19+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/Lzma86Dec.c \
20+
$(SRC)/ext/libchdr/deps/lzma-24.05/src/Sort.c
2521

2622
CHDR_FILES := \
2723
${LZMA_FILES} \
@@ -79,7 +75,7 @@ include $(BUILD_STATIC_LIBRARY)
7975
include $(CLEAR_VARS)
8076
include $(LOCAL_PATH)/Locals.mk
8177

82-
LOCAL_CFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DHAVE_DLFCN_H -DRC_DISABLE_LUA -D_7ZIP_ST
78+
LOCAL_CFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DHAVE_DLFCN_H -DRC_DISABLE_LUA -DZ7_ST
8379

8480
# http://software.intel.com/en-us/articles/getting-started-on-optimizing-ndk-project-for-multiple-cpu-architectures
8581

‎android/jni/Locals.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := \
2020
$(LOCAL_PATH)/../../ext/armips \
2121
$(LOCAL_PATH)/../../ext/armips/ext/filesystem/include \
2222
$(LOCAL_PATH)/../../ext/armips/ext/tinyformat \
23-
$(LOCAL_PATH)/../../ext/libchdr/deps/lzma-22.01/include \
23+
$(LOCAL_PATH)/../../ext/libchdr/deps/lzma-24.05/include \
2424
$(LOCAL_PATH)/../../ext/libchdr/include \
2525
$(LOCAL_PATH)/../../ext/cpu_features/include \
2626
$(LOCAL_PATH)/../../ext/rcheevos/include \

‎ext/libchdr

Submodule libchdr updated 1044 files

‎ext/libchdr-build/CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
11
cmake_minimum_required (VERSION 3.10.0)
22
project (chdr)
33

4-
set(LZMA_DIR ../libchdr/deps/lzma-22.01/src)
4+
set(LZMA_DIR ../libchdr/deps/lzma-24.05/src)
55
set(SRC_DIR ../libchdr/src)
66

7-
include_directories(../libchdr/deps/lzma-22.01/include)
7+
include_directories(../libchdr/deps/lzma-24.05/include)
88
include_directories(../libchdr/include)
99
include_directories(../zlib)
1010
include_directories(../zstd/lib)
1111

12-
add_definitions(-D_7ZIP_ST)
12+
add_definitions(-DZ7_ST)
1313

1414
# Hack - CpuArch.c has a workaround that we reuse.
1515
add_definitions(-D__SWITCH__)
1616

1717
set(ALL_SOURCE_FILES
1818
${LZMA_DIR}/Alloc.c
19-
${LZMA_DIR}/Bcj2.c
20-
${LZMA_DIR}/Bcj2Enc.c
2119
${LZMA_DIR}/Bra.c
2220
${LZMA_DIR}/Bra86.c
21+
${LZMA_DIR}/BraIA64.c
2322
${LZMA_DIR}/CpuArch.c
2423
${LZMA_DIR}/Delta.c
2524
${LZMA_DIR}/LzFind.c
26-
${LZMA_DIR}/LzFindOpt.c
2725
${LZMA_DIR}/LzmaDec.c
2826
${LZMA_DIR}/LzmaEnc.c
2927
${LZMA_DIR}/Lzma86Dec.c
30-
${LZMA_DIR}/Lzma86Enc.c
31-
${LZMA_DIR}/LzmaLib.c
3228
${LZMA_DIR}/Sort.c
3329
${SRC_DIR}/libchdr_bitstream.c
3430
${SRC_DIR}/libchdr_cdrom.c

0 commit comments

Comments
 (0)