From f619e13dfe7f003d828cc86202da3a5f312953a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Wed, 20 Feb 2019 10:35:02 +0100 Subject: [PATCH] add quazip as a dependency --- OpenBoard.pro | 12 ++++++------ plugins/cffadaptor/src/UBCFFAdaptor.cpp | 12 +++++++++--- src/adaptors/UBExportDocument.cpp | 9 +++++++-- src/adaptors/UBExportDocumentSetAdaptor.cpp | 9 +++++++-- src/adaptors/UBExportDocumentSetAdaptor.h | 9 +++++++-- src/adaptors/UBExportWeb.cpp | 9 +++++++-- src/adaptors/UBImportCFF.cpp | 12 +++++++++--- src/adaptors/UBImportDocument.cpp | 12 +++++++++--- src/adaptors/UBImportDocumentSetAdaptor.cpp | 12 +++++++++--- src/frameworks/UBFileSystemUtils.cpp | 6 +++++- 10 files changed, 75 insertions(+), 27 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index d332fac9..0b04032b 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -70,11 +70,6 @@ include(src/pdf-merger/pdfMerger.pri) include(plugins/plugins.pri) INCLUDEPATH += plugins/cffadaptor/src -#ThirdParty -DEPENDPATH += $$THIRD_PARTY_PATH/quazip/ -INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/ -include($$THIRD_PARTY_PATH/quazip/quazip.pri) - FORMS += resources/forms/mainWindow.ui \ resources/forms/preferences.ui \ resources/forms/brushProperties.ui \ @@ -115,7 +110,10 @@ RCC_DIR = $$BUILD_DIR/rcc UI_DIR = $$BUILD_DIR/ui win32 { - + #ThirdParty + DEPENDPATH += $$THIRD_PARTY_PATH/quazip/ + INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/ + include($$THIRD_PARTY_PATH/quazip/quazip.pri) LIBS += -lUser32 LIBS += -lGdi32 @@ -163,6 +161,7 @@ macx { LIBS += -framework AVFoundation LIBS += -framework CoreMedia LIBS += -lcrypto + LIBS += -lquazip CONFIG(release, debug|release):CONFIG += x86_64 CONFIG(debug, debug|release):CONFIG += x86_64 @@ -420,6 +419,7 @@ macx { linux-g++* { CONFIG += link_prl LIBS += -lcrypto + LIBS += -lquazip #LIBS += -lprofiler LIBS += -lX11 QMAKE_CFLAGS += -fopenmp diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index 45d818e8..6d19f4ab 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -34,9 +34,15 @@ #include "UBCFFConstants.h" //THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" + #include "quazipfileinfo.h" +#endif //THIRD_PARTY_WARNINGS_ENABLE UBCFFAdaptor::UBCFFAdaptor() diff --git a/src/adaptors/UBExportDocument.cpp b/src/adaptors/UBExportDocument.cpp index 069baebc..86e5e9a1 100644 --- a/src/adaptors/UBExportDocument.cpp +++ b/src/adaptors/UBExportDocument.cpp @@ -40,8 +40,13 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" +#endif THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/adaptors/UBExportDocumentSetAdaptor.cpp b/src/adaptors/UBExportDocumentSetAdaptor.cpp index b3a72d54..c074a200 100644 --- a/src/adaptors/UBExportDocumentSetAdaptor.cpp +++ b/src/adaptors/UBExportDocumentSetAdaptor.cpp @@ -41,8 +41,13 @@ #include "core/UBForeignObjectsHandler.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" +#endif THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/adaptors/UBExportDocumentSetAdaptor.h b/src/adaptors/UBExportDocumentSetAdaptor.h index 144ff8f2..3171e219 100644 --- a/src/adaptors/UBExportDocumentSetAdaptor.h +++ b/src/adaptors/UBExportDocumentSetAdaptor.h @@ -34,8 +34,13 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" +#endif THIRD_PARTY_WARNINGS_ENABLE class UBDocumentProxy; diff --git a/src/adaptors/UBExportWeb.cpp b/src/adaptors/UBExportWeb.cpp index 01442e77..bc733e7f 100644 --- a/src/adaptors/UBExportWeb.cpp +++ b/src/adaptors/UBExportWeb.cpp @@ -40,8 +40,13 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" +#endif THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/adaptors/UBImportCFF.cpp b/src/adaptors/UBImportCFF.cpp index 83497abd..3a602710 100644 --- a/src/adaptors/UBImportCFF.cpp +++ b/src/adaptors/UBImportCFF.cpp @@ -44,9 +44,15 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" + #include "quazipfileinfo.h" +#endif THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp index 5e632f36..ae128688 100644 --- a/src/adaptors/UBImportDocument.cpp +++ b/src/adaptors/UBImportDocument.cpp @@ -39,9 +39,15 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" + #include "quazipfileinfo.h" +#endif THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/adaptors/UBImportDocumentSetAdaptor.cpp b/src/adaptors/UBImportDocumentSetAdaptor.cpp index a2397b21..f7fe2ef5 100644 --- a/src/adaptors/UBImportDocumentSetAdaptor.cpp +++ b/src/adaptors/UBImportDocumentSetAdaptor.cpp @@ -37,9 +37,15 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazip.h" -#include "quazipfile.h" -#include "quazipfileinfo.h" +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) + #include + #include + #include +#else + #include "quazip.h" + #include "quazipfile.h" + #include "quazipfileinfo.h" +#endif THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index 99f53453..b818a452 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -36,7 +36,11 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#include "quazipfile.h" +#ifdef Q_OS_LINUX + #include +#else + #include "quazipfile.h" +#endif #include THIRD_PARTY_WARNINGS_ENABLE