diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-07-05 18:19:34 +0200 |
|---|---|---|
| committer | Matt Corallo <matt@bluematt.me> | 2011-07-05 18:19:34 +0200 |
| commit | 3f0950ea019ad43c2a8fc79c2aa61845003bd4dc (patch) | |
| tree | 1a89168de277b50121eef8c06f43e46999447ff7 | |
| parent | 9390431ce49893cbdf23846edb4bdf72b3d4e830 (diff) | |
| download | bitcoin-3f0950ea019ad43c2a8fc79c2aa61845003bd4dc.tar.xz | |
Revert "Make UPnP default on Bitcoin but not on Bitcoind."
This reverts commit ee1f884229736da6f5443157ccba97f4e8f50f82.
Stupid, stupid me...there is exactly 0 way to convince make to
execute a conditional based on a target-specific variable.
| -rw-r--r-- | src/makefile.mingw | 24 | ||||
| -rw-r--r-- | src/makefile.osx | 17 | ||||
| -rw-r--r-- | src/makefile.unix | 17 |
3 files changed, 20 insertions, 38 deletions
diff --git a/src/makefile.mingw b/src/makefile.mingw index 994f47c825..507833be48 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -2,6 +2,8 @@ # Distributed under the MIT/X11 software license, see the accompanying # file license.txt or http://www.opensource.org/licenses/mit-license.php. +USE_UPNP:=0 + INCLUDEPATHS= \ -I"C:\boost-1.43.0-mgw" \ -I"C:\db-4.7.25.NC-mgw\build_unix" \ @@ -33,22 +35,12 @@ CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(I HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h init.h - -bitcoin.exe: USE_UPNP:=1 - ifdef USE_UPNP - INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215" - LIBPATHS += -L"C:\upnpc-exe-win32-20110215" - LIBS += -l miniupnpc -l iphlpapi - DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) - endif - -bitcoind.exe: USE_UPNP:=0 - ifdef USE_UPNP - INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215" - LIBPATHS += -L"C:\upnpc-exe-win32-20110215" - LIBS += -l miniupnpc -l iphlpapi - DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) - endif +ifdef USE_UPNP + INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215" + LIBPATHS += -L"C:\upnpc-exe-win32-20110215" + LIBS += -l miniupnpc -l iphlpapi + DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) +endif LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi diff --git a/src/makefile.osx b/src/makefile.osx index 36890f9868..784596b72d 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -16,6 +16,8 @@ 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 \ @@ -47,17 +49,10 @@ OBJS= \ cryptopp/obj/sha.o \ cryptopp/obj/cpu.o -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 +ifdef USE_UPNP + LIBS += $(DEPSDIR)/lib/libminiupnpc.a + DEFS += -DUSE_UPNP=$(USE_UPNP) +endif all: bitcoin 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 \ |