gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877)

This commit is contained in:
Zachary Ware 2024-02-01 17:54:02 -06:00 committed by GitHub
parent 13907968d7
commit 618d7256e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions

View File

@ -0,0 +1 @@
Update Windows builds to use zlib v1.3.1.

View File

@ -58,7 +58,7 @@ set libraries=%libraries% sqlite-3.44.2.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.1
set libraries=%libraries% xz-5.2.5
set libraries=%libraries% zlib-1.2.13
set libraries=%libraries% zlib-1.3.1
for %%e in (%libraries%) do (
if exist "%EXTERNALS_DIR%\%%e" (

View File

@ -78,7 +78,7 @@
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.11\$(ArchName)\</opensslOutDir>
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
</PropertyGroup>
<PropertyGroup>