From e422bebbdc63966df984a8e5cd12d8f4c84da1b8 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 8 Jun 2012 16:35:58 +0000 Subject: Make IPv6 support buildtime-optional again (defaults to enabled) --- src/makefile.linux-mingw | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/makefile.linux-mingw') diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index e22a9f38e..174d0eee1 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -5,6 +5,7 @@ DEPSDIR:=/usr/i586-mingw32msvc USE_UPNP:=0 +USE_IPV6:=1 INCLUDEPATHS= \ -I"$(CURDIR)" \ @@ -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 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 -- cgit v1.2.3 From 45beb88966ff0f54606593f9cf43a5883e8acf49 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 8 Jun 2012 16:36:40 +0000 Subject: Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too --- src/makefile.linux-mingw | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/makefile.linux-mingw') diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 174d0eee1..059504b80 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -35,7 +35,10 @@ CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(D TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) -ifdef USE_UPNP +ifndef USE_UPNP + override USE_UPNP = - +endif +ifneq (${USE_UPNP}, -) LIBPATHS += -L"$(DEPSDIR)/miniupnpc" LIBS += -l miniupnpc -l iphlpapi DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) -- cgit v1.2.3 From 9655d73f49cd4da189ddb2ed708c26dc4cb3babe Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 8 Jun 2012 16:43:06 +0000 Subject: Allow building with IPv6 support, but it disabled by default --- src/makefile.linux-mingw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/makefile.linux-mingw') diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 059504b80..ad74aa6c9 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -45,7 +45,7 @@ ifneq (${USE_UPNP}, -) endif ifneq (${USE_IPV6}, -) - DEFS += -DUSE_IPV6 + DEFS += -DUSE_IPV6=$(USE_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 -- cgit v1.2.3