diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-07-02 01:03:07 +0200 |
|---|---|---|
| committer | Matt Corallo <matt@bluematt.me> | 2011-07-02 01:46:22 +0200 |
| commit | ee1f884229736da6f5443157ccba97f4e8f50f82 (patch) | |
| tree | 2fd1059c6ddb572a9af4ed20454aefe931fa5f1f /src/makefile.osx | |
| parent | c4286dc6eeea90c9ddb509a2019423d032cbad38 (diff) | |
| download | bitcoin-ee1f884229736da6f5443157ccba97f4e8f50f82.tar.xz | |
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.
Diffstat (limited to 'src/makefile.osx')
| -rw-r--r-- | src/makefile.osx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/makefile.osx b/src/makefile.osx index 784596b72d..36890f9868 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -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 |