From e83609365b527abc565214763caace14653ef5d1 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Sat, 10 Oct 2015 09:35:16 +0200 Subject: Fix building from source archive on Windows Change-Id: I35320894a2cf79bb507aeda8aab5c84fd9e8975a Task-number: QTBUG-48237 Task-number: QTBUG-48564 Reviewed-by: Sean Harmer --- src/3rdparty/assimp/assimp.pri | 9 ++++++--- 1 file 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 -- cgit v1.2.3