Make UPnP default on Bitcoin but not on Bitcoind.

This is a bit of an ugly hack, but its the only way to do it.
This commit is contained in:
Matt Corallo
2011-07-02 01:03:07 +02:00
parent c4286dc6ee
commit ee1f884229
3 changed files with 38 additions and 20 deletions

View File

@@ -16,8 +16,6 @@ LIBPATHS= \
WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
USE_UPNP:=0
LIBS= -dead_strip \
$(DEPSDIR)/lib/libdb_cxx-4.8.a \
$(DEPSDIR)/lib/libboost_system.a \
@@ -49,10 +47,17 @@ OBJS= \
cryptopp/obj/sha.o \
cryptopp/obj/cpu.o
ifdef USE_UPNP
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
bitcoin: USE_UPNP:=1
ifdef USE_UPNP
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
bitcoind: USE_UPNP:=0
ifdef USE_UPNP
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
all: bitcoin