diff options
Diffstat (limited to 'quazip.diff')
| -rw-r--r-- | quazip.diff | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/quazip.diff b/quazip.diff index b73a205ba5ec..7bc5a0f121c2 100644 --- a/quazip.diff +++ b/quazip.diff @@ -11,34 +11,14 @@ FORMS += resources/forms/mainWindow.ui \ resources/forms/preferences.ui \ -@@ -164,11 +162,8 @@ - LIBS += -framework CoreMedia - LIBS += -lcrypto - -- 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 --- OpenBoard-1.5.3/plugins/cffadaptor/UBCFFAdaptor.pro 2019-04-10 09:04:25.000000000 +0200 +++ OpenBoard-1.5.3-quazip/plugins/cffadaptor/UBCFFAdaptor.pro 2019-04-12 08:53:45.622844493 +0200 -@@ -14,7 +14,6 @@ - linux-g++-64: SUB_DIR = linux - - THIRD_PARTY_PATH = ../../../Sankore-ThirdParty --QUAZIP_DIR = "$$PWD/../../../Sankore-ThirdParty/quazip/quazip-0.3" - - BUILD_DIR = build/$$SUB_DIR - CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug @@ -39,7 +38,7 @@ QMAKE_POST_LINK += bash postScript_mac.sh "$$DESTDIR" "$$SANKORE_DIR/$$BUILD_DIR/product/Open-Sankore.app/Contents/MacOS" } -LIBS += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip" -+LIBS += "-lquazip" ++LIBS += "-lquazip5" QT += xml xmlpatterns core QT += gui @@ -53,10 +33,3 @@ SOURCES += \ -@@ -66,4 +63,4 @@ - src/UBCFFConstants.h - - RESOURCES += \ -- resources/resources.qrc -\ Brak znaku nowej linii na końcu pliku -+ resources/resources.qrc |