summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-07-02 23:49:26 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-07-02 23:49:26 +0000
commit4b321649a8bf3879a33051e63f250985b97007e3 (patch)
treef747718a98b460616437bd438645d3f89c551d9e /rbutil/rbutilqt
parent971a6e9c9480d07b939f5e80a050ef9f49c89f81 (diff)
downloadrockbox-4b321649a8bf3879a33051e63f250985b97007e3.tar.gz
rockbox-4b321649a8bf3879a33051e63f250985b97007e3.tar.bz2
rockbox-4b321649a8bf3879a33051e63f250985b97007e3.zip
Rockbox Utility: Explicitly link zlib.
zlib is required by the zip class. Explicitly link it instead of relying it to get implicitly linked via Qt. Fixes link errors on distributions with implicit linking disabled. Don't do this on Windows as things are different here. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27251 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 13f31de164..f868156e3b 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -130,6 +130,10 @@ unix:!static:libusb1 {
DEFINES += LIBUSB1
LIBS += -lusb-1.0
}
+unix {
+ # explicitly link zlib, we do need it. Don't rely on implicit linking via Qt.
+ LIBS += -lz
+}
unix:static {
# force statically linking of libusb. Libraries that are appended