diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-01 19:39:05 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-01 19:39:05 -0700 |
| commit | 9cd1dfe8987e6732e602a5f474b21aedf453c636 (patch) | |
| tree | 33df98a2cbcb5954c4b058a3b9918fa783651552 /src/makefile.osx | |
| parent | cfbcb1de66b7a593b354ff1864a82db3b9ddca46 (diff) | |
| parent | ee1f884229736da6f5443157ccba97f4e8f50f82 (diff) | |
| download | bitcoin-9cd1dfe8987e6732e602a5f474b21aedf453c636.tar.xz | |
Merge pull request #372 from TheBlueMatt/upnp
Make UPnP default on Bitcoin but not on Bitcoind.
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 |