Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too

This commit is contained in:
Luke Dashjr
2012-06-08 16:36:40 +00:00
parent 08344c735f
commit 5ebc168006
3 changed files with 12 additions and 3 deletions

View File

@@ -53,7 +53,10 @@ HEADERS = \
wallet.h
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)

View File

@@ -49,7 +49,10 @@ HEADERS = \
util.h \
wallet.h
ifdef USE_UPNP
ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
LIBS += -l miniupnpc -l iphlpapi

View File

@@ -91,7 +91,10 @@ OBJS= \
obj/util.o \
obj/wallet.o
ifdef USE_UPNP
ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
DEFS += -DUSE_UPNP=$(USE_UPNP)
ifdef STATIC
LIBS += $(DEPSDIR)/lib/libminiupnpc.a