Skip to content

Allow linking against system libraries via pkg-config #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WOnder93 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow linking against system libraries via pkg-config #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 53 additions & 49 deletions chessx.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ sound {
QT += multimedia
}

DEFINES += QUAZIP_STATIC
DEFINES += QT_NO_CAST_TO_ASCII
DEFINES *= QT_USE_QSTRINGBUILDER

Expand Down Expand Up @@ -74,6 +73,57 @@ unix|!macx {
# LIBS += -L/home/parallels/openssl-1.1.1q -lcrypto -lssl
}

link_pkgconfig {
PKGCONFIG += quazip1-qt$$QT_MAJOR_VERSION zlib
}
else {
HEADERS += \
src/quazip/JlCompress.h \
src/quazip/crypt.h \
src/quazip/ioapi.h \
src/quazip/quaadler32.h \
src/quazip/quachecksum32.h \
src/quazip/quacrc32.h \
src/quazip/quagzipfile.h \
src/quazip/quaziodevice.h \
src/quazip/quazip.h \
src/quazip/quazip_global.h \
src/quazip/quazipdir.h \
src/quazip/quazipfile.h \
src/quazip/quazipfileinfo.h \
src/quazip/quazipnewinfo.h \
src/quazip/unzip.h \
src/quazip/zip.h

SOURCES += \
src/quazip/JlCompress.cpp \
src/quazip/qioapi.cpp \
src/quazip/quaadler32.cpp \
src/quazip/quacrc32.cpp \
src/quazip/quagzipfile.cpp \
src/quazip/quaziodevice.cpp \
src/quazip/quazip.cpp \
src/quazip/quazipdir.cpp \
src/quazip/quazipfile.cpp \
src/quazip/quazipnewinfo.cpp \
src/quazip/unzip.cpp \
src/quazip/zip.cpp

INCLUDEPATH += src/quazip
DEFINES += QUAZIP_STATIC

INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
win32 {
# DEFINES += ZLIB_WINAPI
# LIBS += -lz
INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
win32-g++:LIBS += -lz
}
else {
LIBS += -lz
}
}

scid {
# Scid sources
HEADERS += \
Expand Down Expand Up @@ -332,23 +382,7 @@ HEADERS += src/database/board.h \
src/gui/textbrowserex.h \
src/gui/textedit.h \
src/gui/toolmainwindow.h \
src/gui/translatingslider.h \
src/quazip/JlCompress.h \
src/quazip/crypt.h \
src/quazip/ioapi.h \
src/quazip/quaadler32.h \
src/quazip/quachecksum32.h \
src/quazip/quacrc32.h \
src/quazip/quagzipfile.h \
src/quazip/quaziodevice.h \
src/quazip/quazip.h \
src/quazip/quazip_global.h \
src/quazip/quazipdir.h \
src/quazip/quazipfile.h \
src/quazip/quazipfileinfo.h \
src/quazip/quazipnewinfo.h \
src/quazip/unzip.h \
src/quazip/zip.h
src/gui/translatingslider.h

SOURCES += \
src/database/analysis.cpp \
Expand Down Expand Up @@ -503,33 +537,12 @@ SOURCES += \
src/gui/testadapter.cpp \
src/gui/textedit.cpp \
src/gui/toolmainwindow.cpp \
src/gui/translatingslider.cpp \
src/quazip/JlCompress.cpp \
src/quazip/qioapi.cpp \
src/quazip/quaadler32.cpp \
src/quazip/quacrc32.cpp \
src/quazip/quagzipfile.cpp \
src/quazip/quaziodevice.cpp \
src/quazip/quazip.cpp \
src/quazip/quazipdir.cpp \
src/quazip/quazipfile.cpp \
src/quazip/quazipnewinfo.cpp \
src/quazip/unzip.cpp \
src/quazip/zip.cpp
src/gui/translatingslider.cpp

INCLUDEPATH += src/database
INCLUDEPATH += src/guess
INCLUDEPATH += src/gui
INCLUDEPATH += src/dialogs
INCLUDEPATH += src/quazip
INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib

win32 {
# DEFINES += ZLIB_WINAPI
# LIBS += -lz
INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
win32-g++:LIBS += -lz
}

UI_DIR = src/generated
MOC_DIR = src/generated
Expand All @@ -547,15 +560,6 @@ CONFIG(release, debug|release) {
DEFINES += QT_NO_DEBUG_OUTPUT NDEBUG
}

!win32 {
CONFIG(debug, debug|release) {
LIBS += -lz
}
CONFIG(release, debug|release) {
LIBS += -lz
}
}

TARGET = chessx

ICON = data/images/chessx.icns
Expand Down
10 changes: 8 additions & 2 deletions src/gui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
#include "openingtreewidget.h"
#include "output.h"
#include "playerlistwidget.h"
#include "quazip.h"
#include "quazipfile.h"
#include "savedialog.h"
#include "settings.h"
#include "studyselectiondialog.h"
Expand All @@ -57,6 +55,14 @@
#include "translatingslider.h"
#include "version.h"

#ifdef QUAZIP_STATIC
#include "quazip.h"
#include "quazipfile.h"
#else
#include <quazip/quazip.h>
#include <quazip/quazipfile.h>
#endif

#include <QtWidgets/qmainwindow.h>
#include <time.h>

Expand Down