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

Merge pull request #18824 from hrydgard/update-libchdr

Browse Source 
Update libchdr to the latest, which supports zstd blocks
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2024-02-04 13:30:31 +01:00
2 parents 4d1cdb28d0 baae042d86
commit 31e1b3c4ea
4 files changed
+13 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UWP/libchdr_UWP/libchdr_UWP.vcxproj
+3 -2
View File
@@ -80,7 +80,8 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" /><PropertyGroup />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
@@ -88,7 +89,7 @@
<ClCompile>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\zstd\lib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
ext/libchdr
+1 -1
Submodule ext/libchdr updated: 9108f34a89...26d27ca490.
ext/libchdr-build/CMakeLists.txt
+1
View File
@@ -7,6 +7,7 @@ set(SRC_DIR ../libchdr/src)
include_directories(../libchdr/deps/lzma-22.01/include)
include_directories(../libchdr/include)
include_directories(../zlib)
include_directories(../zstd/lib)
add_definitions(-D_7ZIP_ST)
ext/libchdr.vcxproj
+8 -8
View File
@@ -197,7 +197,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -216,7 +216,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -234,7 +234,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -252,7 +252,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnablePREfast>false</EnablePREfast>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -277,7 +277,7 @@
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -305,7 +305,7 @@
<OmitFramePointers>true</OmitFramePointers>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -332,7 +332,7 @@
<OmitFramePointers>true</OmitFramePointers>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -359,7 +359,7 @@
<OmitFramePointers>true</OmitFramePointers>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>