mirror of https://git.wownero.com/dsc/mxe.git
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From cd5a0588c69b9d51382196c0b694f8af68f8daa1 Mon Sep 17 00:00:00 2001
|
|
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
Date: Sun, 4 Jun 2017 03:22:13 +0200
|
|
Subject: [PATCH 2/2] add -lz dir for win build
|
|
|
|
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
|
---
|
|
quazip/quazip.pro | 2 ++
|
|
qztest/qztest.pro | 4 ++--
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/quazip/quazip.pro b/quazip/quazip.pro
|
|
index eb68954..ad0f915 100644
|
|
--- a/quazip/quazip.pro
|
|
+++ b/quazip/quazip.pro
|
|
@@ -78,6 +78,8 @@ win32 {
|
|
QMAKE_PKGCONFIG_DESTDIR = ../lib/pkgconfig
|
|
# workaround for qdatetime.h macro bug
|
|
DEFINES += NOMINMAX
|
|
+
|
|
+ LIBS += -lz
|
|
}
|
|
|
|
|
|
diff --git a/qztest/qztest.pro b/qztest/qztest.pro
|
|
index 663aee8..3a9b8e5 100644
|
|
--- a/qztest/qztest.pro
|
|
+++ b/qztest/qztest.pro
|
|
@@ -40,8 +40,8 @@ testquazipfile.cpp \
|
|
OBJECTS_DIR = .obj
|
|
MOC_DIR = .moc
|
|
|
|
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip
|
|
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazipd
|
|
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip -lz
|
|
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazipd -lz
|
|
else:mac:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazip_debug
|
|
else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip
|
|
|
|
--
|
|
2.11.0
|
|
|