From f8a7c51bafe987dbc3ec0b4b53319c97823e1ba1 Mon Sep 17 00:00:00 2001 From: aavit Date: Thu, 24 Mar 2011 13:13:32 +0100 Subject: Upgrading zlib: Patches to build internal zlib in Qt --- src/3rdparty/zlib.pri | 6 +++++- src/3rdparty/zlib/zlib.h | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri index bae3221..b8c4d44 100644 --- a/src/3rdparty/zlib.pri +++ b/src/3rdparty/zlib.pri @@ -5,7 +5,11 @@ SOURCES+= \ $$PWD/zlib/compress.c \ $$PWD/zlib/crc32.c \ $$PWD/zlib/deflate.c \ - $$PWD/zlib/gzio.c \ + $$PWD/zlib/gzclose.c \ + $$PWD/zlib/gzlib.c \ + $$PWD/zlib/gzread.c \ + $$PWD/zlib/gzwrite.c \ + $$PWD/zlib/infback.c \ $$PWD/zlib/inffast.c \ $$PWD/zlib/inflate.c \ $$PWD/zlib/inftrees.c \ diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index bfbba83..4069724 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -33,6 +33,15 @@ #include "zconf.h" +#include "qconfig.h" +#if defined(QT_VISIBILITY_AVAILABLE) +# undef ZEXTERN +# define ZEXTERN __attribute__((visibility("default"))) +#elif defined(QT_MAKEDLL) +# undef ZEXTERN +# define ZEXTERN __declspec(dllexport) +#endif + #ifdef __cplusplus extern "C" { #endif -- cgit v0.12