preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update libchdr to the latest master

Browse Source 
Picks up upstream's hardening against crafted CHD maps and codec payloads
(rtissera/libchdr#198), hunk CRC verification for v3/v4 maps, and RLE/sparse
map fixes.

Upstream split libchdr_chd.c into a file per codec, and its bundled LZMA is now
just a symbol-namespaced LzmaDec.c, so the source lists change in every build.
The zlib codec now defaults to a bundled miniz, so define CHDR_SYSTEM_ZLIB and
CHDR_SYSTEM_ZSTD to keep using our zlib and zstd.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-11-05 13:33:12 +01:00
1 parent fd81cf7e6b
commit 4811df6dcb
9 files changed
+96 -207
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UWP/libchdr_UWP/libchdr_UWP.vcxproj
+13 -13
View File
@@ -19,20 +19,20 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Alloc.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra86.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\BraIA64.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\CpuArch.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Delta.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzFind.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Lzma86Dec.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaDec.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaEnc.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Sort.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-26.02\src\LzmaDec.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_bitstream.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_cdrom.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_chd.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_avhuff.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdfl.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdlz.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdzl.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdzs.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_flac.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_huff.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_lzma.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_zlib.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_zstd.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_flac.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_huffman.c" />
</ItemGroup>
@@ -76,9 +76,9 @@
<ClCompile>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-24.05\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PreprocessorDefinitions>Z7_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
UWP/libchdr_UWP/libchdr_UWP.vcxproj.filters
+11 -31
View File
@@ -13,39 +13,19 @@
<ClCompile Include="..\..\ext\libchdr\src\libchdr_bitstream.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_cdrom.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_chd.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_avhuff.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdfl.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdlz.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdzl.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_cdzs.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_flac.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_huff.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_lzma.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_zlib.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_codec_zstd.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_flac.c" />
<ClCompile Include="..\..\ext\libchdr\src\libchdr_huffman.c" />
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Alloc.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra86.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\BraIA64.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\CpuArch.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Delta.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzFind.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Lzma86Dec.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaDec.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaEnc.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Sort.c">
<ClCompile Include="..\..\ext\libchdr\deps\lzma-26.02\src\LzmaDec.c">
<Filter>lzma</Filter>
</ClCompile>
</ItemGroup>
android/jni/Android.mk
+12 -15
View File
@@ -4,26 +4,23 @@ SRC := ../..
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Locals.mk
LOCAL_CFLAGS += -DZ7_ST -D__SWITCH__
LZMA_FILES := \
$(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
LOCAL_CFLAGS += -DCHDR_SYSTEM_ZLIB -DCHDR_SYSTEM_ZSTD
CHDR_FILES := \
${LZMA_FILES} \
$(SRC)/ext/libchdr/deps/lzma-26.02/src/LzmaDec.c \
$(SRC)/ext/libchdr/src/libchdr_bitstream.c \
$(SRC)/ext/libchdr/src/libchdr_cdrom.c \
$(SRC)/ext/libchdr/src/libchdr_chd.c \
$(SRC)/ext/libchdr/src/libchdr_codec_avhuff.c \
$(SRC)/ext/libchdr/src/libchdr_codec_cdfl.c \
$(SRC)/ext/libchdr/src/libchdr_codec_cdlz.c \
$(SRC)/ext/libchdr/src/libchdr_codec_cdzl.c \
$(SRC)/ext/libchdr/src/libchdr_codec_cdzs.c \
$(SRC)/ext/libchdr/src/libchdr_codec_flac.c \
$(SRC)/ext/libchdr/src/libchdr_codec_huff.c \
$(SRC)/ext/libchdr/src/libchdr_codec_lzma.c \
$(SRC)/ext/libchdr/src/libchdr_codec_zlib.c \
$(SRC)/ext/libchdr/src/libchdr_codec_zstd.c \
$(SRC)/ext/libchdr/src/libchdr_flac.c \
$(SRC)/ext/libchdr/src/libchdr_huffman.c
android/jni/Locals.mk
-1
View File
@@ -22,7 +22,6 @@ 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-24.05/include \
$(LOCAL_PATH)/../../ext/libchdr/include \
$(LOCAL_PATH)/../../ext/cpu_features/include \
$(LOCAL_PATH)/../../ext/rcheevos/include \
ext/libchdr
+1 -1
Submodule ext/libchdr updated: 8bba7745d7...47d794151b.
ext/libchdr-build/CMakeLists.txt
+13 -16
View File
@@ -1,34 +1,31 @@
cmake_minimum_required (VERSION 3.10.0)
project (chdr)
set(LZMA_DIR ../libchdr/deps/lzma-24.05/src)
set(LZMA_DIR ../libchdr/deps/lzma-26.02/src)
set(SRC_DIR ../libchdr/src)
include_directories(../libchdr/deps/lzma-24.05/include)
include_directories(../libchdr/include)
include_directories(../zlib)
include_directories(../zstd/lib)
add_definitions(-DZ7_ST)
# Hack - CpuArch.c has a workaround that we reuse.
add_definitions(-D__SWITCH__)
# Use our zlib and zstd rather than libchdr's bundled miniz and zstd.
add_definitions(-DCHDR_SYSTEM_ZLIB -DCHDR_SYSTEM_ZSTD)
set(ALL_SOURCE_FILES
${LZMA_DIR}/Alloc.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}/LzmaDec.c
${LZMA_DIR}/LzmaEnc.c
${LZMA_DIR}/Lzma86Dec.c
${LZMA_DIR}/Sort.c
${SRC_DIR}/libchdr_bitstream.c
${SRC_DIR}/libchdr_cdrom.c
${SRC_DIR}/libchdr_chd.c
${SRC_DIR}/libchdr_codec_avhuff.c
${SRC_DIR}/libchdr_codec_cdfl.c
${SRC_DIR}/libchdr_codec_cdlz.c
${SRC_DIR}/libchdr_codec_cdzl.c
${SRC_DIR}/libchdr_codec_cdzs.c
${SRC_DIR}/libchdr_codec_flac.c
${SRC_DIR}/libchdr_codec_huff.c
${SRC_DIR}/libchdr_codec_lzma.c
${SRC_DIR}/libchdr_codec_zlib.c
${SRC_DIR}/libchdr_codec_zstd.c
${SRC_DIR}/libchdr_flac.c
${SRC_DIR}/libchdr_huffman.c
)
ext/libchdr.vcxproj
+23 -38
View File
@@ -27,37 +27,22 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="libchdr\deps\lzma-24.05\src\Alloc.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\Bra.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\Bra86.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\BraIA64.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\CpuArch.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\Delta.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzFind.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\Lzma86Dec.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzmaDec.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzmaEnc.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\Sort.c" />
<ClCompile Include="libchdr\deps\lzma-26.02\src\LzmaDec.c" />
<ClCompile Include="libchdr\src\libchdr_bitstream.c" />
<ClCompile Include="libchdr\src\libchdr_cdrom.c" />
<ClCompile Include="libchdr\src\libchdr_chd.c" />
<ClCompile Include="libchdr\src\libchdr_codec_avhuff.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdfl.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdlz.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdzl.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdzs.c" />
<ClCompile Include="libchdr\src\libchdr_codec_flac.c" />
<ClCompile Include="libchdr\src\libchdr_codec_huff.c" />
<ClCompile Include="libchdr\src\libchdr_codec_lzma.c" />
<ClCompile Include="libchdr\src\libchdr_codec_zlib.c" />
<ClCompile Include="libchdr\src\libchdr_codec_zstd.c" />
<ClCompile Include="libchdr\src\libchdr_flac.c" />
<ClCompile Include="libchdr\src\libchdr_huffman.c" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\7zTypes.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\7zWindows.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Alloc.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Bra.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Compiler.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\CpuArch.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Delta.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzFind.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzHash.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Lzma86.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzmaDec.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzmaEnc.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Precomp.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\RotateDefs.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\Sort.h" />
<ClInclude Include="libchdr\include\dr_libs\dr_flac.h" />
<ClInclude Include="libchdr\include\libchdr\bitstream.h" />
<ClInclude Include="libchdr\include\libchdr\cdrom.h" />
@@ -175,14 +160,14 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<PreprocessorDefinitions>Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -195,13 +180,13 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<PreprocessorDefinitions>Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -213,13 +198,13 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<PreprocessorDefinitions>Z7_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -234,7 +219,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnablePREfast>false</EnablePREfast>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -244,7 +229,7 @@
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -262,7 +247,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>false</TreatWarningAsError>
<EnablePREfast>false</EnablePREfast>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -272,7 +257,7 @@
<OmitFramePointers>true</OmitFramePointers>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -289,7 +274,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CHDR_SYSTEM_ZLIB;CHDR_SYSTEM_ZSTD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>false</TreatWarningAsError>
<EnablePREfast>false</EnablePREfast>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -299,7 +284,7 @@
<OmitFramePointers>true</OmitFramePointers>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
ext/libchdr.vcxproj.filters
+11 -76
View File
@@ -4,39 +4,19 @@
<ClCompile Include="libchdr\src\libchdr_bitstream.c" />
<ClCompile Include="libchdr\src\libchdr_cdrom.c" />
<ClCompile Include="libchdr\src\libchdr_chd.c" />
<ClCompile Include="libchdr\src\libchdr_codec_avhuff.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdfl.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdlz.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdzl.c" />
<ClCompile Include="libchdr\src\libchdr_codec_cdzs.c" />
<ClCompile Include="libchdr\src\libchdr_codec_flac.c" />
<ClCompile Include="libchdr\src\libchdr_codec_huff.c" />
<ClCompile Include="libchdr\src\libchdr_codec_lzma.c" />
<ClCompile Include="libchdr\src\libchdr_codec_zlib.c" />
<ClCompile Include="libchdr\src\libchdr_codec_zstd.c" />
<ClCompile Include="libchdr\src\libchdr_flac.c" />
<ClCompile Include="libchdr\src\libchdr_huffman.c" />
<ClCompile Include="libchdr\deps\lzma-24.05\src\Alloc.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\Bra.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\Bra86.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\BraIA64.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\CpuArch.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\Delta.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzFind.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\Lzma86Dec.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzmaDec.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzmaEnc.c">
<Filter>LZMA</Filter>
</ClCompile>
<ClCompile Include="libchdr\deps\lzma-24.05\src\Sort.c">
<ClCompile Include="libchdr\deps\lzma-26.02\src\LzmaDec.c">
<Filter>LZMA</Filter>
</ClCompile>
</ItemGroup>
@@ -48,51 +28,6 @@
<ClInclude Include="libchdr\include\libchdr\chdconfig.h" />
<ClInclude Include="libchdr\include\libchdr\flac.h" />
<ClInclude Include="libchdr\include\libchdr\huffman.h" />
<ClInclude Include="libchdr\deps\lzma-24.05\include\7zTypes.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\7zWindows.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Alloc.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Bra.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Compiler.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\CpuArch.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Delta.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzFind.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzHash.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Lzma86.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzmaDec.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\LzmaEnc.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Precomp.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\RotateDefs.h">
<Filter>LZMA</Filter>
</ClInclude>
<ClInclude Include="libchdr\deps\lzma-24.05\include\Sort.h">
<Filter>LZMA</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="LZMA">
libretro/Makefile.common
+12 -16
View File
@@ -265,28 +265,24 @@ SOURCES_C += \
COREFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024
COREFLAGS += -DHTTPS_NOT_AVAILABLE
COREFLAGS += -DZ7_ST
INCFLAGS += -I$(EXTDIR)/libchdr/deps/lzma-24.05/include
SOURCES_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
COREFLAGS += -DCHDR_SYSTEM_ZLIB -DCHDR_SYSTEM_ZSTD
INCFLAGS += -I$(EXTDIR)/libchdr/include
SOURCES_C += \
$(EXTDIR)/libchdr/deps/lzma-26.02/src/LzmaDec.c \
$(EXTDIR)/libchdr/src/libchdr_bitstream.c \
$(EXTDIR)/libchdr/src/libchdr_cdrom.c \
$(EXTDIR)/libchdr/src/libchdr_chd.c \
$(EXTDIR)/libchdr/src/libchdr_codec_avhuff.c \
$(EXTDIR)/libchdr/src/libchdr_codec_cdfl.c \
$(EXTDIR)/libchdr/src/libchdr_codec_cdlz.c \
$(EXTDIR)/libchdr/src/libchdr_codec_cdzl.c \
$(EXTDIR)/libchdr/src/libchdr_codec_cdzs.c \
$(EXTDIR)/libchdr/src/libchdr_codec_flac.c \
$(EXTDIR)/libchdr/src/libchdr_codec_huff.c \
$(EXTDIR)/libchdr/src/libchdr_codec_lzma.c \
$(EXTDIR)/libchdr/src/libchdr_codec_zlib.c \
$(EXTDIR)/libchdr/src/libchdr_codec_zstd.c \
$(EXTDIR)/libchdr/src/libchdr_flac.c \
$(EXTDIR)/libchdr/src/libchdr_huffman.c