ZLIB enabled only for UNIX based systems

This commit is contained in:
Filip Bucek 2019-11-14 12:51:28 +01:00
parent 886cc3c777
commit 5ea2b6f3e1
5 changed files with 16 additions and 2 deletions

View File

@ -29,6 +29,9 @@ QT += network sql
CONFIG += c++14 CONFIG += c++14
INCLUDEPATH += $$PWD/src/ INCLUDEPATH += $$PWD/src/
DEPENDPATH += $$PWD/src/serversdk DEPENDPATH += $$PWD/src/serversdk
# enable zlib compression on linux
unix: DEFINES += USE_ZLIB
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$SDKDIR/release/libserversdk.a win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$SDKDIR/release/libserversdk.a
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$SDKDIR/debug/libserversdk.a else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$SDKDIR/debug/libserversdk.a

View File

@ -7,6 +7,8 @@ CONFIG += c++14
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
unix: DEFINES += USE_ZLIB
SOURCES += \ SOURCES += \
core.cpp \ core.cpp \
databasemanager.cpp \ databasemanager.cpp \
@ -30,3 +32,4 @@ HEADERS += \
utils.h \ utils.h \
soaprequest.h \ soaprequest.h \
databasetable.h databasetable.h

View File

@ -3,11 +3,14 @@
#include <QFileInfo> #include <QFileInfo>
#include <QDir> #include <QDir>
#ifdef USE_ZLIB
#include <zlib.h> // gzip decompress #include <zlib.h> // gzip decompress
#endif
namespace serversdk { namespace serversdk {
#ifdef USE_ZLIB
/** /**
* @brief Decompress gzip data * @brief Decompress gzip data
* @param compressed gzip data * @param compressed gzip data
@ -74,6 +77,7 @@ QByteArray Utils::decompress(const QByteArray &compressed)
return result; return result;
} }
#endif
} // namespace core } // namespace core

View File

@ -9,7 +9,10 @@ namespace serversdk {
class Utils class Utils
{ {
public: public:
#ifdef USE_ZLIB
static QByteArray decompress(const QByteArray &compressed); static QByteArray decompress(const QByteArray &compressed);
#endif
}; };
} // namespace serversdk } // namespace serversdk

View File

@ -9,4 +9,5 @@ SUBDIRS += \
database/tst_postgresql.pro \ database/tst_postgresql.pro \
database/tst_databasetable.pro \ database/tst_databasetable.pro \
database/tst_databaseutils.pro \ database/tst_databaseutils.pro \
tst_utils
unix: SUBDIRS += tst_utils