mirror of https://git.wownero.com/dsc/mxe.git
quazip: use qmake option instead of patch
This commit is contained in:
parent
129121e548
commit
4a87a21011
|
@ -1,42 +0,0 @@
|
|||
From 619a1ce43e43aafd0922a03d6778662927c54643 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
||||
Date: Sun, 20 May 2018 11:44:59 +0200
|
||||
Subject: [PATCH] explictly link to zlib
|
||||
|
||||
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 ef64051..61b4483 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/ -lquazip_debug
|
||||
else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -20,7 +20,9 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(BUILD_DIR)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(SOURCE_DIR)' \
|
||||
$(if $(BUILD_STATIC), CONFIG\+=staticlib) \
|
||||
PREFIX=$(PREFIX)/$(TARGET)
|
||||
PREFIX=$(PREFIX)/$(TARGET) \
|
||||
'-after' \
|
||||
'win32:static:LIBS_PRIVATE += -lz'
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
|
||||
$(if $(BUILD_STATIC), \
|
||||
echo 'Cflags.private: -DQUAZIP_STATIC' >> $(BUILD_DIR)/quazip/lib/pkgconfig/quazip.pc)
|
||||
|
|
Loading…
Reference in New Issue