summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-03-03 19:31:26 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-03-03 19:31:26 +0000
commit9946def79da50037c78f5068a4f38c22f4848c73 (patch)
treeaf2adb874b738bb82f9953bbe2492a661433fc55 /rbutil/rbutilqt
parent5664d8412ddab42bac1cdd8f77a6e94bb66b024a (diff)
downloadrockbox-9946def79da50037c78f5068a4f38c22f4848c73.tar.gz
rockbox-9946def79da50037c78f5068a4f38c22f4848c73.tar.bz2
rockbox-9946def79da50037c78f5068a4f38c22f4848c73.zip
Don't link libz explicitly on Windows.
On Windows Qt already includes libz. Since the Qt SDK comes without a separate libz linking it explicitly fails. Also, if libz is installed via MinGW linking it explicitly will clash with the libz functions in Qt. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29512 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index ca7214989c..13667dd25b 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -116,7 +116,10 @@ INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher
DEPENDPATH = $$INCLUDEPATH
-LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl -lz
+LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl
+!win32 {
+ LIBS += -lz
+}
# Add a (possibly found) libspeex now, don't do this before -lrbspeex!
!static:!isEmpty(LIBSPEEX) {