mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Update libchdr to latest
This commit is contained in:
Henrik Rydgård
@@ -27,22 +27,17 @@
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Alloc.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2Enc.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra86.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\BraIA64.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\CpuArch.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Delta.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFind.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFindOpt.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Dec.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Enc.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaDec.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaEnc.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaLib.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Sort.c" />
|
||||
<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\src\libchdr_bitstream.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\src\libchdr_cdrom.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\src\libchdr_chd.c" />
|
||||
@@ -89,9 +84,9 @@
|
||||
<ClCompile>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\zstd\lib;..\..\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-24.05\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@@ -102,4 +97,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@@ -15,53 +15,38 @@
|
||||
<ClCompile Include="..\..\ext\libchdr\src\libchdr_chd.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\src\libchdr_flac.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\src\libchdr_huffman.c" />
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Alloc.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Alloc.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bcj2Enc.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Bra86.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\BraIA64.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Bra86.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\CpuArch.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\BraIA64.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Delta.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\CpuArch.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzFind.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Delta.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Lzma86Dec.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFind.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaDec.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzFindOpt.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\LzmaEnc.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Dec.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Lzma86Enc.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaDec.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaEnc.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\LzmaLib.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-22.01\src\Sort.c">
|
||||
<ClCompile Include="..\..\ext\libchdr\deps\lzma-24.05\src\Sort.c">
|
||||
<Filter>lzma</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
+13
-17
@@ -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
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+1
-1
Submodule ext/libchdr updated: 26d27ca490...8bba7745d7
@@ -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
|
||||
|
||||
+43
-33
@@ -35,27 +35,37 @@
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Alloc.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bcj2.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bcj2Enc.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bra.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bra86.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\BraIA64.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\CpuArch.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Delta.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzFind.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzFindOpt.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Lzma86Dec.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Lzma86Enc.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzmaDec.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzmaEnc.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzmaLib.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Sort.c" />
|
||||
<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\src\libchdr_bitstream.c" />
|
||||
<ClCompile Include="libchdr\src\libchdr_cdrom.c" />
|
||||
<ClCompile Include="libchdr\src\libchdr_chd.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" />
|
||||
@@ -190,14 +200,14 @@
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;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-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -210,13 +220,13 @@
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;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-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -228,13 +238,13 @@
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;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-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -246,13 +256,13 @@
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;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-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -267,7 +277,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
@@ -277,7 +287,7 @@
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -295,7 +305,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TreatWarningAsError>false</TreatWarningAsError>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
@@ -305,7 +315,7 @@
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -322,7 +332,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TreatWarningAsError>false</TreatWarningAsError>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
@@ -332,7 +342,7 @@
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -349,7 +359,7 @@
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_7ZIP_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>Z7_ST;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TreatWarningAsError>false</TreatWarningAsError>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
@@ -359,7 +369,7 @@
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-22.01\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>libchdr\include;libchdr\deps\lzma-24.05\include;zlib;zstd\lib;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -371,4 +381,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
+56
-26
@@ -6,52 +6,37 @@
|
||||
<ClCompile Include="libchdr\src\libchdr_chd.c" />
|
||||
<ClCompile Include="libchdr\src\libchdr_flac.c" />
|
||||
<ClCompile Include="libchdr\src\libchdr_huffman.c" />
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Alloc.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\Alloc.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bcj2.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\Bra.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bcj2Enc.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\Bra86.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bra.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\BraIA64.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Bra86.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\CpuArch.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\BraIA64.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\Delta.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\CpuArch.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzFind.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Delta.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\Lzma86Dec.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzFind.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzmaDec.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzFindOpt.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\LzmaEnc.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Lzma86Dec.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Lzma86Enc.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzmaDec.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzmaEnc.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\LzmaLib.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="libchdr\deps\lzma-22.01\src\Sort.c">
|
||||
<ClCompile Include="libchdr\deps\lzma-24.05\src\Sort.c">
|
||||
<Filter>LZMA</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
@@ -63,6 +48,51 @@
|
||||
<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">
|
||||
|
||||
+13
-17
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user