diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-12-15 15:08:34 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-12-15 17:06:03 +0200 |
| commit | eacc9498350eea41a1f00371ea1adfa7f4608a31 (patch) | |
| tree | 25170107b8f3f9b3eb1e2f4a0a9d684131b129a7 | |
| parent | 149c06e80328a6f60d416efa276dde80a21cdb8c (diff) | |
| download | qtlocation-mapboxgl-eacc9498350eea41a1f00371ea1adfa7f4608a31.tar.gz | |
[windows][core] Use Qt's own zlib on Windows
| -rw-r--r-- | mapbox-gl-native.pro | 6 | ||||
| -rw-r--r-- | src/mbgl/util/compression.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mapbox-gl-native.pro b/mapbox-gl-native.pro index 6ebbd0df96..48ada53f04 100644 --- a/mapbox-gl-native.pro +++ b/mapbox-gl-native.pro @@ -15,8 +15,10 @@ QMAKE_CXXFLAGS += \ -fvisibility-inlines-hidden \ -fvisibility=hidden -LIBS += \ - -lz +!win32 { + LIBS += \ + -lz +} android|win32|darwin { SOURCES += \ diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp index 94089c1b26..d8bca88318 100644 --- a/src/mbgl/util/compression.cpp +++ b/src/mbgl/util/compression.cpp @@ -1,6 +1,10 @@ #include <mbgl/util/compression.hpp> +#ifdef _WINDOWS && QT_VERSION >= 0x050000 +#include <QtZlib/zlib.h> +#else #include <zlib.h> +#endif #include <cstdio> #include <cstring> |