diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-25 09:11:08 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-25 13:38:04 +0200 |
| commit | b1ef9f55e4b66565dd7c9e17262e921cbee58b20 (patch) | |
| tree | a4b4c4a071ce15e25eada16be83642562c4fc6a4 /src/3rdparty | |
| parent | 2cd49fac0f09e957933eb1c0aec6e54205b58a6b (diff) | |
Added DEFINES to make assimp compile on gcc 4.6
Change-Id: I89cb64d697ca9814ad23bf4673b581abfd9d4909
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index 634a8e611..df5ba9c2d 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -15,7 +15,7 @@ contains(QT_CONFIG, system-zlib) { INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib } -DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB +DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER # Stop compiler complaining about ignored qualifiers on return types gcc: QMAKE_CXXFLAGS += -Wno-ignored-qualifiers |