diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-05 10:10:26 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-05 10:10:26 -0700 |
| commit | bb0d9ce2264c3b50d11850491c800654abffa1a5 (patch) | |
| tree | 18a1a0375e7d98ab7ff0bc9ce30c56a98e0ffdaa /src/makefile.unix | |
| parent | 9390431ce49893cbdf23846edb4bdf72b3d4e830 (diff) | |
| parent | 09923991e58e3c7f92cbcf1a7cf89a8bd5304d15 (diff) | |
| download | bitcoin-bb0d9ce2264c3b50d11850491c800654abffa1a5.tar.xz | |
Merge pull request #384 from TheBlueMatt/upnp
Fix UPnP building, entirely my fault.
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 82d2a9f5c1..bb26bf5edd 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -8,6 +8,8 @@ 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 @@ -21,17 +23,10 @@ LIBS= \ -l ssl \ -l crypto -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 +ifdef USE_UPNP + LIBS += -l miniupnpc + DEFS += -DUSE_UPNP=$(USE_UPNP) +endif LIBS+= \ -Wl,-Bdynamic \ |