using macports for poppler (so 10.13 lib is available) + updated quazip homebrew's lib (to improve)

preferencesAboutTextFull
Clément Fauconnier 3 years ago
parent fe95d069c1
commit 4707745ca0
  1. 13
      OpenBoard.pro

@ -178,26 +178,25 @@ macx {
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 14) { equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 14) {
LIBS += "-L../OpenBoard-ThirdParty/quazip/lib/macx" "-lquazip" LIBS += "-L../OpenBoard-ThirdParty/quazip/lib/macx" "-lquazip"
} else { } else {
LIBS += -L/usr/local/opt/quazip/lib -lquazip LIBS += -L/usr/local/opt/quazip/lib -lquazip1-qt5
} }
LIBS += -L/usr/local/opt/ffmpeg/lib LIBS += -L/opt/local/lib
INCLUDEPATH += /usr/local/opt/openssl/include INCLUDEPATH += /usr/local/opt/openssl/include
INCLUDEPATH += /usr/local/opt/ffmpeg/include INCLUDEPATH += /opt/local/include
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 14) { equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 14) {
INCLUDEPATH += ../OpenBoard-ThirdParty/quazip/quazip-0.7.1 INCLUDEPATH += ../OpenBoard-ThirdParty/quazip/quazip-0.7.1
} else { } else {
INCLUDEPATH += /usr/local/opt/quazip/include/quazip INCLUDEPATH += /usr/local/opt/quazip/include/quazip
} }
LIBS += -L/usr/local/opt/poppler/lib -lpoppler LIBS += -L/opt/local/lib -lpoppler
INCLUDEPATH += /usr/local/opt/poppler/include INCLUDEPATH += /opt/local/include/poppler
INCLUDEPATH += /usr/local/opt/poppler/include/poppler
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
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
QMAKE_CXXFLAGS += -Wno-overloaded-virtual QMAKE_CXXFLAGS += -Wno-overloaded-virtual
#VERSION_RC_PATH = "$$BUILD_DIR/version_rc" #VERSION_RC_PATH = "$$BUILD_DIR/version_rc"

Loading…
Cancel
Save