Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't link libz explicitly on Windows.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2011-03-03 19:31:26 +00:00
parent 5664d8412d
commit 9946def79d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rbutil/rbutilqt/rbutilqt.pro
View file

@ -116,7 +116,10 @@ INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher
DEPENDPATH = $$INCLUDEPATH 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! # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
!static:!isEmpty(LIBSPEEX) { !static:!isEmpty(LIBSPEEX) {