Make IPv6 support buildtime-optional again (defaults to enabled)

This commit is contained in:
Luke Dashjr
2012-06-08 16:35:58 +00:00
parent cf78183fad
commit e422bebbdc
5 changed files with 33 additions and 5 deletions

View File

@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = bitcoin-qt
VERSION = 0.6.99
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
# for boost 1.37, add -mt to the boost libraries
@@ -71,6 +71,14 @@ contains(FIRST_CLASS_MESSAGING, 1) {
DEFINES += FIRST_CLASS_MESSAGING
}
# use: qmake "USE_IPV6=1" (enabled; default)
# or: qmake "USE_IPV6=-" (not supported)
contains(USE_IPV6, -) {
message(Building without IPv6 support)
} else {
DEFINES += USE_IPV6
}
contains(BITCOIN_NEED_QT_PLUGINS, 1) {
DEFINES += BITCOIN_NEED_QT_PLUGINS
QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets