Merge pull request #12418 from FranciscoPombal/improve_win_conf_pri

Improve Windows qmake build configuration files
This commit is contained in:
Vladimir Golovnev 2020-05-25 14:23:13 +03:00 committed by GitHub
commit b44816305f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -13,17 +13,16 @@ LIBS += $$quote(-LC:/qBittorrent/openssl/lib)
# Adapt the lib names/versions accordingly # Adapt the lib names/versions accordingly
# If you want to use Boost auto-linking then disable # If you want to use Boost auto-linking then disable
# BOOST_ALL_NO_LIB below and omit Boost libraries here # BOOST_ALL_NO_LIB below and omit Boost libraries here
LIBS += libcrypto.lib libssl.lib libtorrent.lib zlib.lib
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += libtorrentd.lib \ LIBS += boost_system-vc140-mt-d.lib
libboost_system-vc140-mt-sgd-1_64.lib
} }
else { else {
LIBS += libtorrent.lib \ LIBS += boost_system-vc140-mt.lib
libboost_system-vc140-mt-s-1_64.lib
} }
LIBS += libeay32.lib ssleay32.lib
LIBS += zlib.lib
# ...or if you use MinGW # ...or if you use MinGW
#LIBS += libcrypto libssl libz
#CONFIG(debug, debug|release) { #CONFIG(debug, debug|release) {
# LIBS += libtorrent-rasterbar \ # LIBS += libtorrent-rasterbar \
# libboost_system-mt # libboost_system-mt
@ -32,8 +31,6 @@ LIBS += zlib.lib
# LIBS += libtorrent-rasterbar \ # LIBS += libtorrent-rasterbar \
# libboost_system-mt # libboost_system-mt
#} #}
#LIBS += libcrypto libssl
#LIBS += libz
# Disable to use Boost auto-linking # Disable to use Boost auto-linking
DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ALL_NO_LIB