diff --git a/serversdkint.pri b/serversdkint.pri index bec8e78..9935f31 100644 --- a/serversdkint.pri +++ b/serversdkint.pri @@ -29,6 +29,9 @@ QT += network sql CONFIG += c++14 INCLUDEPATH += $$PWD/src/ 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 else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$SDKDIR/debug/libserversdk.a diff --git a/src/serversdk/serversdk.pro b/src/serversdk/serversdk.pro index 432bb48..78100d2 100644 --- a/src/serversdk/serversdk.pro +++ b/src/serversdk/serversdk.pro @@ -7,6 +7,8 @@ CONFIG += c++14 INCLUDEPATH += $$PWD +unix: DEFINES += USE_ZLIB + SOURCES += \ core.cpp \ databasemanager.cpp \ @@ -30,3 +32,4 @@ HEADERS += \ utils.h \ soaprequest.h \ databasetable.h + diff --git a/src/serversdk/utils.cpp b/src/serversdk/utils.cpp index 007c17b..0432ed7 100644 --- a/src/serversdk/utils.cpp +++ b/src/serversdk/utils.cpp @@ -3,11 +3,14 @@ #include #include +#ifdef USE_ZLIB #include // gzip decompress - +#endif namespace serversdk { + +#ifdef USE_ZLIB /** * @brief Decompress gzip data * @param compressed gzip data @@ -74,6 +77,7 @@ QByteArray Utils::decompress(const QByteArray &compressed) return result; } +#endif } // namespace core diff --git a/src/serversdk/utils.h b/src/serversdk/utils.h index 06d5a93..033b29a 100644 --- a/src/serversdk/utils.h +++ b/src/serversdk/utils.h @@ -9,7 +9,10 @@ namespace serversdk { class Utils { public: +#ifdef USE_ZLIB static QByteArray decompress(const QByteArray &compressed); +#endif + }; } // namespace serversdk diff --git a/test/auto/auto.pro b/test/auto/auto.pro index 33c4aed..7f8f624 100644 --- a/test/auto/auto.pro +++ b/test/auto/auto.pro @@ -9,4 +9,5 @@ SUBDIRS += \ database/tst_postgresql.pro \ database/tst_databasetable.pro \ database/tst_databaseutils.pro \ - tst_utils + +unix: SUBDIRS += tst_utils