Skip to content

Commit ad5584b

Browse files
author
Ondrej Mosnacek
committed
Allow linking against system quazip library
When 'system_quazip' is added to CONFIG, chessx will now (dynamically) link against the quazip library installed on the system, rather than using the bundled version. Default behavior remains unchanged. Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
1 parent ff2a4a7 commit ad5584b

2 files changed

Lines changed: 54 additions & 34 deletions

File tree

‎chessx.pro‎

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ sound {
3636
QT += multimedia
3737
}
3838

39-
DEFINES += QUAZIP_STATIC
4039
DEFINES += QT_NO_CAST_TO_ASCII
4140
DEFINES *= QT_USE_QSTRINGBUILDER
4241

@@ -79,6 +78,50 @@ unix|!macx {
7978
binfiles.path = $$BINDIR
8079
}
8180

81+
system_quazip {
82+
unix {
83+
CONFIG += link_pkgconfig
84+
PKGCONFIG += quazip1-qt5
85+
}
86+
else: error("Cannot use system_quazip on this platform!")
87+
}
88+
else {
89+
HEADERS += \
90+
src/quazip/JlCompress.h \
91+
src/quazip/crypt.h \
92+
src/quazip/ioapi.h \
93+
src/quazip/quaadler32.h \
94+
src/quazip/quachecksum32.h \
95+
src/quazip/quacrc32.h \
96+
src/quazip/quagzipfile.h \
97+
src/quazip/quaziodevice.h \
98+
src/quazip/quazip.h \
99+
src/quazip/quazip_global.h \
100+
src/quazip/quazipdir.h \
101+
src/quazip/quazipfile.h \
102+
src/quazip/quazipfileinfo.h \
103+
src/quazip/quazipnewinfo.h \
104+
src/quazip/unzip.h \
105+
src/quazip/zip.h
106+
107+
SOURCES += \
108+
src/quazip/JlCompress.cpp \
109+
src/quazip/qioapi.cpp \
110+
src/quazip/quaadler32.cpp \
111+
src/quazip/quacrc32.cpp \
112+
src/quazip/quagzipfile.cpp \
113+
src/quazip/quaziodevice.cpp \
114+
src/quazip/quazip.cpp \
115+
src/quazip/quazipdir.cpp \
116+
src/quazip/quazipfile.cpp \
117+
src/quazip/quazipnewinfo.cpp \
118+
src/quazip/unzip.cpp \
119+
src/quazip/zip.cpp
120+
121+
INCLUDEPATH += src/quazip
122+
DEFINES += QUAZIP_STATIC
123+
}
124+
82125
scid {
83126
# Scid sources
84127
HEADERS += \
@@ -325,23 +368,7 @@ HEADERS += src/database/board.h \
325368
src/gui/textbrowserex.h \
326369
src/gui/textedit.h \
327370
src/gui/toolmainwindow.h \
328-
src/gui/translatingslider.h \
329-
src/quazip/JlCompress.h \
330-
src/quazip/crypt.h \
331-
src/quazip/ioapi.h \
332-
src/quazip/quaadler32.h \
333-
src/quazip/quachecksum32.h \
334-
src/quazip/quacrc32.h \
335-
src/quazip/quagzipfile.h \
336-
src/quazip/quaziodevice.h \
337-
src/quazip/quazip.h \
338-
src/quazip/quazip_global.h \
339-
src/quazip/quazipdir.h \
340-
src/quazip/quazipfile.h \
341-
src/quazip/quazipfileinfo.h \
342-
src/quazip/quazipnewinfo.h \
343-
src/quazip/unzip.h \
344-
src/quazip/zip.h
371+
src/gui/translatingslider.h
345372

346373
SOURCES += \
347374
src/database/analysis.cpp \
@@ -490,26 +517,13 @@ SOURCES += \
490517
src/gui/testadapter.cpp \
491518
src/gui/textedit.cpp \
492519
src/gui/toolmainwindow.cpp \
493-
src/gui/translatingslider.cpp \
494-
src/quazip/JlCompress.cpp \
495-
src/quazip/qioapi.cpp \
496-
src/quazip/quaadler32.cpp \
497-
src/quazip/quacrc32.cpp \
498-
src/quazip/quagzipfile.cpp \
499-
src/quazip/quaziodevice.cpp \
500-
src/quazip/quazip.cpp \
501-
src/quazip/quazipdir.cpp \
502-
src/quazip/quazipfile.cpp \
503-
src/quazip/quazipnewinfo.cpp \
504-
src/quazip/unzip.cpp \
505-
src/quazip/zip.cpp
520+
src/gui/translatingslider.cpp
506521

507522
TEMPLATE = app
508523
INCLUDEPATH += src/database
509524
INCLUDEPATH += src/guess
510525
INCLUDEPATH += src/gui
511526
INCLUDEPATH += src/dialogs
512-
INCLUDEPATH += src/quazip
513527
INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
514528

515529
win32 {

‎src/gui/mainwindow.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
#include "output.h"
4949
#include "pgndatabase.h"
5050
#include "playerlistwidget.h"
51-
#include "quazip.h"
52-
#include "quazipfile.h"
5351
#include "savedialog.h"
5452
#include "settings.h"
5553
#include "style.h"
@@ -60,6 +58,14 @@
6058
#include "translatingslider.h"
6159
#include "version.h"
6260

61+
#ifdef QUAZIP_STATIC
62+
#include "quazip.h"
63+
#include "quazipfile.h"
64+
#else
65+
#include <quazip/quazip.h>
66+
#include <quazip/quazipfile.h>
67+
#endif
68+
6369
#include <time.h>
6470

6571
#include <QApplication>

0 commit comments

Comments
 (0)