diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-03 16:17:45 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-06 19:52:18 +0000 |
| commit | 6ec968bec872dfbab98be0752cab134ba057dd19 (patch) | |
| tree | 3910c52cd91c2bd3eaabab9ad6898b4701a30c43 /src/3rdparty | |
| parent | 872efa5619d20a421142a88e1a38f131c08d44d1 (diff) | |
qgltf: Do not use system-zlib for host tools
It was wrong of us to assume that a QT_CONFIG containing system-zlib
meant that we could use zlib for a host_build. There are cases where
the host does not have zlib, but the target does (cross compilation). It
also breaks the rules for host_build tools. Fortunately the bootstrap
library does provide the zlib symbols, so we just need to make sure we
include that.
Change-Id: Ibe25a22676c47909d95a83df46e311bd486fc9f7
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index d171fbc83..261fc6645 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -10,7 +10,7 @@ CONFIG -= precompile_header win32:DEFINES+=_CRT_SECURE_NO_WARNINGS -contains(QT_CONFIG, system-zlib) { +!host_build:contains(QT_CONFIG, system-zlib) { if (unix|mingw): LIBS += -lz else: LIBS += zdll.lib } else { @@ -18,6 +18,10 @@ contains(QT_CONFIG, system-zlib) { INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib else: \ INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib + # Needed to use the QtBootstrap's Zlib + if(contains(QT_CONFIG, zlib)|cross_compile) { + DEFINES += Z_PREFIX + } } DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER |