diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-02-06 14:54:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 14:54:05 (GMT) |
| commit | b5a679304b9914658dc38208c59f64cee653d718 (patch) | |
| tree | 14954f37472b0cd5ffcdfd85ba698e2a604b1be0 /PCbuild | |
| parent | a11312456d05a06feed00ee9e530e50fcadb7011 (diff) | |
| download | cpython-b5a679304b9914658dc38208c59f64cee653d718.zip cpython-b5a679304b9914658dc38208c59f64cee653d718.tar.gz cpython-b5a679304b9914658dc38208c59f64cee653d718.tar.bz2 | |
[3.11] gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877) (GH-115080)
gh-111239: Update Windows build to use zlib 1.3.1 (GH-114877)
(cherry picked from commit 618d7256e78da8200f6e2c6235094a1ef885dca4)
Co-authored-by: Zachary Ware <zach@python.org>
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index f29f39e..a3cf92e 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12. 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.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" ( diff --git a/PCbuild/python.props b/PCbuild/python.props index 9a003c6..fcdd9b4 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -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> |