Use <OS_name>conf.pri file to control libz linkage

This commit is contained in:
Nick Tiskov 2013-03-10 23:50:03 +04:00 committed by sledgehammer999
parent c6845781c7
commit c6e0facc0b
6 changed files with 9 additions and 5 deletions

View file

@ -19,6 +19,8 @@ LIBS += -lboost_system-mt
#LIBS += -lboost_filesystem-mt #LIBS += -lboost_filesystem-mt
# Carbon # Carbon
LIBS += -framework Carbon -framework IOKit LIBS += -framework Carbon -framework IOKit
# Zlib
LIBS += -lz
document_icon.path = Contents/Resources document_icon.path = Contents/Resources
document_icon.files = mac/qBitTorrentDocument.icns document_icon.files = mac/qBitTorrentDocument.icns

View file

@ -7,7 +7,7 @@ LIBS += -ltorrent-rasterbar \
-lboost_thread \ -lboost_thread \
-lboost_system \ -lboost_system \
-lboost_filesystem \ -lboost_filesystem \
-lssl -lcrypto -lidn -lpthread -lssl -lcrypto -lidn -lpthread -lz
RC_FILE = qbittorrent_os2.rc RC_FILE = qbittorrent_os2.rc

View file

@ -60,9 +60,6 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
# filesystem v3 is the default. # filesystem v3 is the default.
DEFINES += BOOST_FILESYSTEM_VERSION=2 DEFINES += BOOST_FILESYSTEM_VERSION=2
# We need lz to gunzip HTTP responses.
LIBS += -lz
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD

View file

@ -10,7 +10,7 @@ QMAKE_CXXFLAGS += -Wformat -Wformat-security
QMAKE_LFLAGS_APP += -rdynamic QMAKE_LFLAGS_APP += -rdynamic
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += libtorrent-rasterbar PKGCONFIG += libtorrent-rasterbar
LIBS += -lssl -lcrypto LIBS += -lssl -lcrypto -lz
# Man page # Man page
nox { nox {

View file

@ -28,3 +28,4 @@ CONFIG(debug, debug|release) {
LIBS += advapi32.lib shell32.lib crypt32.lib LIBS += advapi32.lib shell32.lib crypt32.lib
LIBS += libeay32.lib ssleay32.lib LIBS += libeay32.lib ssleay32.lib
LIBS += PowrProf.lib LIBS += PowrProf.lib
LIBS += zlib.lib

View file

@ -4,11 +4,15 @@
INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_51_0) INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_51_0)
#Point this to the libtorrent include folder #Point this to the libtorrent include folder
INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_16/include) INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_16/include)
#Point this to the zlib include folder
INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include)
#Point this to the boost lib folder #Point this to the boost lib folder
LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib)
#Point this to the libtorrent lib folder #Point this to the libtorrent lib folder
LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/<path-according-to-the-build-options-chosen>) LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/<path-according-to-the-build-options-chosen>)
#Point this to the zlib lib folder
LIBS += $$quote(-LC:/qBittorrent/Zlib/lib)
# LIBTORRENT DEFINES # LIBTORRENT DEFINES
DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ALL_NO_LIB