From b8bc595546be756b0599858e513460c59eacefe2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 8 Dec 2017 00:10:52 +0100 Subject: [PATCH] Use zlib submodule with "wx_zlib_" prefix This will allow projects to use static wxWidgets libraries and zlib (either directly or indirectly, as can heppen e.g. via Boost.IOStreams) at the same time without link conflicts. See #15314. --- docs/changes.txt | 1 + src/zlib | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index ae7438e8a4..4b3e200dff 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -104,6 +104,7 @@ All: - Don't crash in wxFFile::Eof() or Error() on closed file (jprotopopov). - Add UTF-8 support to wxZipOutputStream (Tobias Taschner). - Update all bundled 3rd party libraries to their latest versions. +- Use unique prefix for all zlib symbols to avoid link conflicts. All (GUI): diff --git a/src/zlib b/src/zlib index 1c1550729c..5888671274 160000 --- a/src/zlib +++ b/src/zlib @@ -1 +1 @@ -Subproject commit 1c1550729c409333f3cf4705a995c460599547a1 +Subproject commit 5888671274cde770edbe683b435f052de2b03681