From bcf18abfd9568b58b3cba31b9ddfed6a0cb5bcf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Wed, 20 Feb 2019 10:52:59 +0100 Subject: [PATCH] fixed an issue with quazip dependency on OSX + commit OpenBoard.pro changes for OSX (may need to be improved) --- OpenBoard.pro | 7 ++++++- src/frameworks/UBFileSystemUtils.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 0b04032b..3763c01a 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -161,7 +161,12 @@ macx { LIBS += -framework AVFoundation LIBS += -framework CoreMedia LIBS += -lcrypto - LIBS += -lquazip + LIBS += -L/usr/local/opt/quazip/lib + LIBS += -L/usr/local/opt/ffmpeg/lib + + INCLUDEPATH += /usr/local/opt/openssl/include + INCLUDEPATH += /usr/local/opt/ffmpeg/include + INCLUDEPATH += /usr/local/opt/quazip/include CONFIG(release, debug|release):CONFIG += x86_64 CONFIG(debug, debug|release):CONFIG += x86_64 diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index b818a452..608478f5 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -36,7 +36,7 @@ #include "globals/UBGlobals.h" THIRD_PARTY_WARNINGS_DISABLE -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) #include #else #include "quazipfile.h"