diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-02 23:49:26 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-02 23:49:26 +0000 |
commit | 4b321649a8bf3879a33051e63f250985b97007e3 (patch) | |
tree | f747718a98b460616437bd438645d3f89c551d9e /rbutil | |
parent | 971a6e9c9480d07b939f5e80a050ef9f49c89f81 (diff) | |
download | rockbox-4b321649a8bf3879a33051e63f250985b97007e3.tar.gz 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')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 4 |
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 { | |||
130 | DEFINES += LIBUSB1 | 130 | DEFINES += LIBUSB1 |
131 | LIBS += -lusb-1.0 | 131 | LIBS += -lusb-1.0 |
132 | } | 132 | } |
133 | unix { | ||
134 | # explicitly link zlib, we do need it. Don't rely on implicit linking via Qt. | ||
135 | LIBS += -lz | ||
136 | } | ||
133 | 137 | ||
134 | unix:static { | 138 | unix:static { |
135 | # force statically linking of libusb. Libraries that are appended | 139 | # force statically linking of libusb. Libraries that are appended |