diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2015-10-10 09:35:16 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:57:33 +0000 |
| commit | e83609365b527abc565214763caace14653ef5d1 (patch) | |
| tree | 6e372b8f5e4d4ae6221e5505dd46f7a898276a73 | |
| parent | 0bcb6600db2a74ee8c8b51207d3ba15e4973aa95 (diff) | |
Fix building from source archive on Windows
Change-Id: I35320894a2cf79bb507aeda8aab5c84fd9e8975a
Task-number: QTBUG-48237
Task-number: QTBUG-48564
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -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 370d0d136..73c6381ec 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 |