mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too
This commit is contained in:
parent
e422bebbdc
commit
45beb88966
@ -35,7 +35,10 @@ CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(D
|
|||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifndef USE_UPNP
|
||||||
|
override USE_UPNP = -
|
||||||
|
endif
|
||||||
|
ifneq (${USE_UPNP}, -)
|
||||||
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
|
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
|
||||||
LIBS += -l miniupnpc -l iphlpapi
|
LIBS += -l miniupnpc -l iphlpapi
|
||||||
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
||||||
|
@ -30,7 +30,10 @@ CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-par
|
|||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifndef USE_UPNP
|
||||||
|
override USE_UPNP = -
|
||||||
|
endif
|
||||||
|
ifneq (${USE_UPNP}, -)
|
||||||
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
|
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
|
||||||
LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
|
LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
|
||||||
LIBS += -l miniupnpc -l iphlpapi
|
LIBS += -l miniupnpc -l iphlpapi
|
||||||
|
@ -97,7 +97,10 @@ OBJS= \
|
|||||||
obj/walletdb.o \
|
obj/walletdb.o \
|
||||||
obj/noui.o
|
obj/noui.o
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifndef USE_UPNP
|
||||||
|
override USE_UPNP = -
|
||||||
|
endif
|
||||||
|
ifneq (${USE_UPNP}, -)
|
||||||
DEFS += -DUSE_UPNP=$(USE_UPNP)
|
DEFS += -DUSE_UPNP=$(USE_UPNP)
|
||||||
ifdef STATIC
|
ifdef STATIC
|
||||||
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
|
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
|
||||||
|
Loading…
Reference in New Issue
Block a user