Revert "fixed an issue with quazip dependency on OSX + commit OpenBoard.pro changes for OSX (may need to be improved)"

This reverts commit bcf18abfd9.
preferencesAboutTextFull
Clément Fauconnier 6 years ago
parent 4b5825fa4b
commit b5df0a9097
  1. 7
      OpenBoard.pro
  2. 2
      src/frameworks/UBFileSystemUtils.cpp

@ -161,12 +161,7 @@ macx {
LIBS += -framework AVFoundation LIBS += -framework AVFoundation
LIBS += -framework CoreMedia LIBS += -framework CoreMedia
LIBS += -lcrypto LIBS += -lcrypto
LIBS += -L/usr/local/opt/quazip/lib LIBS += -lquazip
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(release, debug|release):CONFIG += x86_64
CONFIG(debug, debug|release):CONFIG += x86_64 CONFIG(debug, debug|release):CONFIG += x86_64

@ -36,7 +36,7 @@
#include "globals/UBGlobals.h" #include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE THIRD_PARTY_WARNINGS_DISABLE
#if defined(Q_OS_LINUX) || defined(Q_OS_OSX) #ifdef Q_OS_LINUX
#include <quazip/quazipfile.h> #include <quazip/quazipfile.h>
#else #else
#include "quazipfile.h" #include "quazipfile.h"

Loading…
Cancel
Save