diff options
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 2 | ||||
| -rw-r--r-- | tools/qgltf/qgltf.pro | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index fb607815b..d1bb1d457 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 -!host_build:contains(QT_CONFIG, system-zlib) { +contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { if (unix|mingw): LIBS += -lz else: LIBS += zdll.lib } else { diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index 66496cc8c..b6aa6f048 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -18,7 +18,6 @@ config_assimp:!cross_compile { # Extend framework search path to make #include <QtCore/*> work QMAKE_CXXFLAGS += -F$$QT.core.libs } - CONFIG += force_bootstrap include(../../src/3rdparty/assimp/assimp.pri) } |