mirror of https://github.com/python/cpython
bpo-40859: Update Windows build to use xz-5.2.5 (GH-20622)
This commit is contained in:
parent
e4e8895ae3
commit
a059395921
|
@ -0,0 +1 @@
|
|||
Update Windows build to use xz-5.2.5
|
|
@ -58,7 +58,7 @@ set libraries=%libraries% sqlite-3.38.1.0
|
|||
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
|
||||
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
|
||||
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
|
||||
set libraries=%libraries% xz-5.2.2
|
||||
set libraries=%libraries% xz-5.2.5
|
||||
set libraries=%libraries% zlib-1.2.12
|
||||
|
||||
for %%e in (%libraries%) do (
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<DisableSpecificWarnings>4028;4113;4133;4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
@ -238,7 +238,7 @@
|
|||
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_decoder.h" />
|
||||
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_encoder.h" />
|
||||
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_private.h" />
|
||||
<ClInclude Include="$(lzmaDir)windows\config.h" />
|
||||
<ClInclude Include="$(lzmaDir)windows\vs2019\config.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
|
@ -428,7 +428,7 @@
|
|||
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_private.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(lzmaDir)windows\config.h">
|
||||
<ClInclude Include="$(lzmaDir)windows\vs2019\config.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
|
||||
<sqlite3Dir>$(ExternalsDir)sqlite-3.38.1.0\</sqlite3Dir>
|
||||
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
|
||||
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
|
||||
<lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
|
||||
<libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
|
||||
<libffiOutDir>$(ExternalsDir)libffi-3.4.2\$(ArchName)\</libffiOutDir>
|
||||
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
|
||||
|
|
Loading…
Reference in New Issue