diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2015-10-10 09:35:16 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-14 18:52:20 +0000 |
| commit | 21e80f8c40d6cd8795b03b846161771f7ecc7aa3 (patch) | |
| tree | f8e0b9ce167dfe7f74833424e81516b98d7fed0f /src/3rdparty | |
| parent | f1a6f3b8828595feadee66a86aa0dd2fb387b6e3 (diff) | |
Fix building from source archive on Windows
Change-Id: I35320894a2cf79bb507aeda8aab5c84fd9e8975a
Task-number: QTBUG-48237
Task-number: QTBUG-48564
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index ea63531de..0b63fd5bb 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -11,10 +11,13 @@ CONFIG -= precompile_header win32:DEFINES+=_CRT_SECURE_NO_WARNINGS contains(QT_CONFIG, system-zlib) { - unix|mingw: LIBS += -lz - else: LIBS += zdll.lib + if (unix|mingw): LIBS += -lz + else: LIBS += zdll.lib } else { - INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib + git_build: \ + INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib + else: \ + INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib } DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER |