Skip to content

Commit

Permalink
pythongh-111239: Update Windows build to use zlib 1.3.1 (pythonGH-114877
Browse files Browse the repository at this point in the history
)

(cherry picked from commit 618d725)

Co-authored-by: Zachary Ware <zach@python.org>
  • Loading branch information
zware authored and miss-islington committed Feb 6, 2024
1 parent 9b66caf commit dfec155
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
@@ -0,0 +1 @@
Update Windows builds to use zlib v1.3.1.
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
Expand Up @@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
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" (
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
Expand Up @@ -78,7 +78,7 @@
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.13\$(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>
Expand Down

0 comments on commit dfec155

Please sign in to comment.