summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-10-21 21:31:13 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-10-21 21:33:39 +0200
commitce3da6238f4dd80ed008d385631bbbfe8d7b280a (patch)
tree476bd9192c0d29808f8d09db656faa8407dc476d /rbutil/rbutilqt
parent1801dcc99985566de4c74721543661a80a78cdc8 (diff)
downloadrockbox-ce3da6238f4dd80ed008d385631bbbfe8d7b280a.tar.gz
rockbox-ce3da6238f4dd80ed008d385631bbbfe8d7b280a.tar.bz2
rockbox-ce3da6238f4dd80ed008d385631bbbfe8d7b280a.zip
rbutil: Fix linking zlib on Windows.
With Qt4 zlib was linked implicitly (and explicitly linking it caused errors). This was a Qt issue that has been resolved with (at least current) Qt5, now we need to explicitly link zlib on native Windows. Change-Id: Ia5a6bdc83a39f6f5629c34ed835d2272a887f161
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro5
1 files changed, 1 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index a7d0a179e6..b3516f796b 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -146,10 +146,7 @@ for(rblib, RBLIBS) {
LIBS += -l$$rblib
}
-# on win32 libz is linked implicitly.
-!win32 {
- LIBS += -lz
-}
+LIBS += -lz
# Add a (possibly found) libspeex now, don't do this before -lrbspeex!
!static:!isEmpty(LIBSPEEX) {