From c6e0facc0b8e9e233a73930162b2c5b6fa803f96 Mon Sep 17 00:00:00 2001
From: Nick Tiskov <daymansmail@gmail.com>
Date: Sun, 10 Mar 2013 23:50:03 +0400
Subject: [PATCH] Use <OS_name>conf.pri file to control libz linkage

---
 macxconf.pri     | 2 ++
 os2conf.pri      | 2 +-
 src/src.pro      | 3 ---
 unixconf.pri     | 2 +-
 winconf-msvc.pri | 1 +
 winconf.pri      | 4 ++++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/macxconf.pri b/macxconf.pri
index 273b122f4..abf071207 100644
--- a/macxconf.pri
+++ b/macxconf.pri
@@ -19,6 +19,8 @@ LIBS += -lboost_system-mt
 #LIBS += -lboost_filesystem-mt
 # Carbon
 LIBS += -framework Carbon -framework IOKit
+# Zlib
+LIBS += -lz
 
 document_icon.path = Contents/Resources
 document_icon.files = mac/qBitTorrentDocument.icns
diff --git a/os2conf.pri b/os2conf.pri
index 47e9b18d6..2e49504e8 100644
--- a/os2conf.pri
+++ b/os2conf.pri
@@ -7,7 +7,7 @@ LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \
         -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread
+        -lssl -lcrypto -lidn -lpthread -lz
 
 RC_FILE = qbittorrent_os2.rc
 
diff --git a/src/src.pro b/src/src.pro
index 12586b14d..2d8f8462b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -60,9 +60,6 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
 # filesystem v3 is the default.
 DEFINES += BOOST_FILESYSTEM_VERSION=2
 
-# We need lz to gunzip HTTP responses.
-LIBS += -lz
-
 INCLUDEPATH += $$PWD
 
 
diff --git a/unixconf.pri b/unixconf.pri
index a816909a8..d32053e99 100644
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -10,7 +10,7 @@ QMAKE_CXXFLAGS += -Wformat -Wformat-security
 QMAKE_LFLAGS_APP += -rdynamic
 CONFIG += link_pkgconfig
 PKGCONFIG += libtorrent-rasterbar
-LIBS += -lssl -lcrypto
+LIBS += -lssl -lcrypto -lz
 
 # Man page
 nox {
diff --git a/winconf-msvc.pri b/winconf-msvc.pri
index 89bc9c215..35e6cc302 100644
--- a/winconf-msvc.pri
+++ b/winconf-msvc.pri
@@ -28,3 +28,4 @@ CONFIG(debug, debug|release) {
 LIBS += advapi32.lib shell32.lib crypt32.lib
 LIBS += libeay32.lib ssleay32.lib
 LIBS += PowrProf.lib
+LIBS += zlib.lib
diff --git a/winconf.pri b/winconf.pri
index c97b30726..4111503e3 100644
--- a/winconf.pri
+++ b/winconf.pri
@@ -4,11 +4,15 @@
 INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_51_0)
 #Point this to the libtorrent include folder
 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
 LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib)
 #Point this to the libtorrent lib folder
 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
 DEFINES += BOOST_ALL_NO_LIB