Browse Source

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

pull/1/head
Luke Dashjr 10 years ago
parent
commit
e422bebbdc
  1. 10
      bitcoin-qt.pro
  2. 7
      src/makefile.linux-mingw
  3. 7
      src/makefile.mingw
  4. 7
      src/makefile.osx
  5. 7
      src/makefile.unix

10
bitcoin-qt.pro

@ -2,7 +2,7 @@ TEMPLATE = app @@ -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) { @@ -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

7
src/makefile.linux-mingw

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
DEPSDIR:=/usr/i586-mingw32msvc
USE_UPNP:=0
USE_IPV6:=1
INCLUDEPATHS= \
-I"$(CURDIR)" \
@ -28,7 +29,7 @@ LIBS= \ @@ -28,7 +29,7 @@ LIBS= \
-l ssl \
-l crypto
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
DEBUGFLAGS=-g
CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
@ -40,6 +41,10 @@ ifdef USE_UPNP @@ -40,6 +41,10 @@ ifdef USE_UPNP
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
endif
ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6
endif
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are

7
src/makefile.mingw

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
USE_UPNP:=0
USE_IPV6:=1
INCLUDEPATHS= \
-I"C:\boost-1.49.0-mgw" \
@ -23,7 +24,7 @@ LIBS= \ @@ -23,7 +24,7 @@ LIBS= \
-l ssl \
-l crypto
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
DEBUGFLAGS=-g
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
@ -36,6 +37,10 @@ ifdef USE_UPNP @@ -36,6 +37,10 @@ ifdef USE_UPNP
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
endif
ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6
endif
LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are

7
src/makefile.osx vendored

@ -20,6 +20,7 @@ LIBPATHS= \ @@ -20,6 +20,7 @@ LIBPATHS= \
-L"$(DEPSDIR)/lib/db48"
USE_UPNP:=1
USE_IPV6:=1
LIBS= -dead_strip
@ -53,7 +54,7 @@ LIBS += \ @@ -53,7 +54,7 @@ LIBS += \
TESTDEFS += -DBOOST_TEST_DYN_LINK
endif
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE
ifdef RELEASE
# Compile for maximum compatibility and smallest size.
@ -105,6 +106,10 @@ else @@ -105,6 +106,10 @@ else
endif
endif
ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6
endif
all: bitcoind
# auto-generated dependencies:

7
src/makefile.unix

@ -3,10 +3,11 @@ @@ -3,10 +3,11 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
USE_UPNP:=0
USE_IPV6:=1
LINK:=$(CXX)
DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE
DEFS=-DBOOST_SPIRIT_THREADSAFE
DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
@ -43,6 +44,10 @@ ifneq (${USE_UPNP}, -) @@ -43,6 +44,10 @@ ifneq (${USE_UPNP}, -)
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6
endif
LIBS+= \
-Wl,-B$(LMODE2) \
-l z \

Loading…
Cancel
Save