Merge pull request #95 from sledgehammer999/update_windows_build

Updated Windows build conf files.

winconf-msvc.pri

@@ -6,16 +6,12 @@ DEFINES += TORRENT_USE_WPATH
 #Adapt the lib names/versions accordingly
 CONFIG(debug, debug|release) {
   LIBS += libtorrentd.lib \
-          libboost_system-vc90-mt-gd.lib \
-          libboost_filesystem-vc90-mt-gd.lib \
-          libboost_thread-vc90-mt-gd.lib
+          libboost_system-vc90-mt-sgd-1_51.lib
 } else {
   LIBS += libtorrent.lib \
-          libboost_system-vc90-mt.lib \
-          libboost_filesystem-vc90-mt.lib \
-          libboost_thread-vc90-mt.lib
+          libboost_system-vc90-mt-s-1_51.lib
 }
 
-LIBS += advapi32.lib shell32.lib
+LIBS += advapi32.lib shell32.lib crypt32.lib
 LIBS += libeay32MD.lib ssleay32MD.lib
 LIBS += PowrProf.lib

winconf.pri

@@ -1,40 +1,33 @@
 # Adapt these paths on Windows
 
 #Point this to the boost include folder
-INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_46_0)
+INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_51_0)
 #Point this to the libtorrent include folser
-INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_15/include)
-#Point this to the zlib include folder(libtorrent's if you used that)
-INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_15/zlib)
-#Point this to the openssl include folder
-INCLUDEPATH += $$quote(C:/OpenSSL/include)
+INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_16/include)
 
-#Point this to the openssl lib folder
-LIBS += $$quote(-LC:/OpenSSL/lib/VC)
-#Point this to the libtorrent lib folder
-LIBS += $$quote(-LC:/qBittorrent/RC_0_15/bin/<path-according-to-the-build-options-chosen>)
 #Point this to the boost lib folder
-LIBS += $$quote(-LC:/qBittorrent/boost_1_46_0/stage/lib)
+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>)
 
 # LIBTORRENT DEFINES
 DEFINES += BOOST_ALL_NO_LIB
 DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021
+DEFINES += BOOST_ASIO_SEPARATE_COMPILATION
 DEFINES += BOOST_EXCEPTION_DISABLE
 DEFINES += BOOST_SYSTEM_STATIC_LINK=1
-DEFINES += BOOST_THREAD_USE_LIB
-DEFINES += BOOST_THREAD_USE_LIB=1
 DEFINES += TORRENT_USE_OPENSSL
 DEFINES += UNICODE
-DEFINES += WIN32
-DEFINES += WIN32_LEAN_AND_MEAN
-DEFINES += _CRT_SECURE_NO_DEPRECATE
-DEFINES += _FILE_OFFSET_BITS=64
-DEFINES += _SCL_SECURE_NO_DEPRECATE
 DEFINES += _UNICODE
+DEFINES += WIN32
 DEFINES += _WIN32
+DEFINES += WIN32_LEAN_AND_MEAN
 DEFINES += _WIN32_WINNT=0x0500
 DEFINES += _WIN32_IE=0x0500
+DEFINES += _CRT_SECURE_NO_DEPRECATE
+DEFINES += _SCL_SECURE_NO_DEPRECATE
 DEFINES += __USE_W32_SOCKETS
+DEFINES += _FILE_OFFSET_BITS=64
 DEFINES += WITH_SHIPPED_GEOIP_H
 
 CONFIG(debug, debug|release) {