Created
January 23, 2014 13:19
-
-
Save BrunoReX/8578305 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/src.pro b/src/src.pro | |
index 01f51f1..2b45bd3 100644 | |
--- a/src/src.pro | |
+++ b/src/src.pro | |
@@ -58,7 +58,7 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS | |
# Fixes compilation with Boost >= v1.46 where boost | |
# filesystem v3 is the default. | |
-DEFINES += BOOST_FILESYSTEM_VERSION=2 | |
+#DEFINES += BOOST_FILESYSTEM_VERSION=2 | |
INCLUDEPATH += $$PWD | |
diff --git a/winconf-msvc.pri b/winconf-msvc.pri | |
index 7db9815..afa3c14 100644 | |
--- a/winconf-msvc.pri | |
+++ b/winconf-msvc.pri | |
@@ -21,10 +21,10 @@ DEFINES += TORRENT_USE_WPATH | |
#Adapt the lib names/versions accordingly | |
CONFIG(debug, debug|release) { | |
LIBS += libtorrentd.lib \ | |
- libboost_system-vc90-mt-sgd-1_51.lib | |
+ boost_system.lib | |
} else { | |
LIBS += libtorrent.lib \ | |
- libboost_system-vc90-mt-s-1_51.lib | |
+ boost_system.lib | |
} | |
LIBS += advapi32.lib shell32.lib crypt32.lib User32.lib | |
diff --git a/winconf.pri b/winconf.pri | |
index 5a3de1d..4c38798 100644 | |
--- a/winconf.pri | |
+++ b/winconf.pri | |
@@ -1,32 +1,38 @@ | |
# Adapt these paths on Windows | |
#Point this to the boost include folder | |
-INCLUDEPATH += $$quote(C:/qBittorrent/boost_1_51_0) | |
+INCLUDEPATH += $$quote(T:/install/Boost/include) | |
#Point this to the libtorrent include folder | |
-INCLUDEPATH += $$quote(C:/qBittorrent/RC_0_16/include) | |
+INCLUDEPATH += $$quote(T:/install/libtorrent/include) | |
#Point this to the zlib include folder | |
-INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include) | |
+INCLUDEPATH += $$quote(T:/install/Zlib/include) | |
+#Point this to the openssl include folder | |
+INCLUDEPATH += $$quote(T:/install/OpenSSL/include) | |
#Point this to the boost lib folder | |
-LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) | |
+LIBS += $$quote(-LT:/install/Boost/lib) | |
#Point this to the libtorrent lib folder | |
-LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/<path-according-to-the-build-options-chosen>) | |
+LIBS += $$quote(-LT:/install/libtorrent/lib) | |
#Point this to the zlib lib folder | |
-LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) | |
+LIBS += $$quote(-LT:/install/Zlib/lib) | |
+#Point this to the openssl lib folder | |
+LIBS += $$quote(-LT:/install/OpenSSL/lib) | |
# LIBTORRENT DEFINES | |
DEFINES += BOOST_ALL_NO_LIB | |
+DEFINES += BOOST_ASIO_ENABLE_CANCELIO | |
DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 | |
-DEFINES += BOOST_ASIO_SEPARATE_COMPILATION | |
+DEFINES += BOOST_ASIO_DYN_LINK | |
+DEFINES += BOOST_ALL_DYN_LINK | |
DEFINES += BOOST_EXCEPTION_DISABLE | |
-DEFINES += BOOST_SYSTEM_STATIC_LINK=1 | |
DEFINES += TORRENT_USE_OPENSSL | |
+DEFINES += TORRENT_LINKING_SHARED | |
DEFINES += UNICODE | |
DEFINES += _UNICODE | |
DEFINES += WIN32 | |
DEFINES += _WIN32 | |
DEFINES += WIN32_LEAN_AND_MEAN | |
-DEFINES += _WIN32_WINNT=0x0500 | |
+DEFINES += _WIN32_WINNT=0x0600 | |
DEFINES += _WIN32_IE=0x0500 | |
DEFINES += _CRT_SECURE_NO_DEPRECATE | |
DEFINES += _SCL_SECURE_NO_DEPRECATE |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment