1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- OpenBoard-1.5.3/OpenBoard.pro 2019-04-10 09:04:25.000000000 +0200
+++ OpenBoard-1.5.3-quazip/OpenBoard.pro 2019-04-12 08:54:40.265598779 +0200
@@ -71,9 +71,7 @@
INCLUDEPATH += plugins/cffadaptor/src
#ThirdParty
-DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
-INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
-include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+INCLUDEPATH += /usr/include/quazip5/
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"
QT += xml xmlpatterns core
QT += gui
@@ -51,9 +50,7 @@
INCLUDEPATH += src
-DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
-INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
-include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+INCLUDEPATH += /usr/include/quazip5/
SOURCES += \
@@ -66,4 +63,4 @@
src/UBCFFConstants.h
RESOURCES += \
- resources/resources.qrc
\ Brak znaku nowej linii na końcu pliku
+ resources/resources.qrc
|