diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2018-06-29 09:39:54 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2018-06-29 11:41:55 (GMT) |
| commit | 4a87a210119e0a83923a017fc89790f0349416b0 (patch) | |
| tree | 1bf57515e1f83e1807ba4adf6752a67e4a5406c8 | |
| parent | 129121e54893abde03cb86610d1003d5ee73cb70 (diff) | |
| download | mxe-4a87a210119e0a83923a017fc89790f0349416b0.zip mxe-4a87a210119e0a83923a017fc89790f0349416b0.tar.gz mxe-4a87a210119e0a83923a017fc89790f0349416b0.tar.bz2 | |
quazip: use qmake option instead of patch
| -rw-r--r-- | src/quazip-1-fixes.patch | 42 | ||||
| -rw-r--r-- | src/quazip.mk | 4 |
2 files changed, 3 insertions, 43 deletions
diff --git a/src/quazip-1-fixes.patch b/src/quazip-1-fixes.patch deleted file mode 100644 index 2a55271..0000000 --- a/src/quazip-1-fixes.patch +++ /dev/null @@ -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 - diff --git a/src/quazip.mk b/src/quazip.mk index dd68b95..4e7cecc 100644 --- a/src/quazip.mk +++ b/src/quazip.mk @@ -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) |