diff options
Diffstat (limited to 'src/3rdparty/assimp/assimp.pri')
| -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 |