aboutsummaryrefslogtreecommitdiff
path: root/src/makefile.unix
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2011-07-02 01:03:07 +0200
committerMatt Corallo <matt@bluematt.me>2011-07-02 01:46:22 +0200
commitee1f884229736da6f5443157ccba97f4e8f50f82 (patch)
tree2fd1059c6ddb572a9af4ed20454aefe931fa5f1f /src/makefile.unix
parentc4286dc6eeea90c9ddb509a2019423d032cbad38 (diff)
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.unix')
-rw-r--r--src/makefile.unix17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/makefile.unix b/src/makefile.unix
index bb26bf5edd..82d2a9f5c1 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -8,8 +8,6 @@ WXINCLUDEPATHS=$(shell wx-config --cxxflags)
WXLIBS=$(shell wx-config --libs)
-USE_UPNP:=0
-
DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
# for boost 1.37, add -mt to the boost libraries
@@ -23,10 +21,17 @@ LIBS= \
-l ssl \
-l crypto
-ifdef USE_UPNP
- LIBS += -l miniupnpc
- DEFS += -DUSE_UPNP=$(USE_UPNP)
-endif
+bitcoin: USE_UPNP:=1
+ ifdef USE_UPNP
+ LIBS += -l miniupnpc
+ DEFS += -DUSE_UPNP=$(USE_UPNP)
+ endif
+
+bitcoind: USE_UPNP:=0
+ ifdef USE_UPNP
+ LIBS += -l miniupnpc
+ DEFS += -DUSE_UPNP=$(USE_UPNP)
+ endif
LIBS+= \
-Wl,-Bdynamic \