neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #372 from TheBlueMatt/upnp

Browse Source 
Make UPnP default on Bitcoin but not on Bitcoind.
This commit is contained in:
Jeff Garzik 2011-07-01 19:39:05 -07:00
commit 9cd1dfe898
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/makefile.mingw
View File

@ -2,8 +2,6 @@
# Distributed under the MIT/X11 software license, see the accompanying # Distributed under the MIT/X11 software license, see the accompanying
# file license.txt or http://www.opensource.org/licenses/mit-license.php. # file license.txt or http://www.opensource.org/licenses/mit-license.php.
USE_UPNP:=0
INCLUDEPATHS= \ INCLUDEPATHS= \
-I"C:\boost-1.43.0-mgw" \ -I"C:\boost-1.43.0-mgw" \
-I"C:\db-4.7.25.NC-mgw\build_unix" \ -I"C:\db-4.7.25.NC-mgw\build_unix" \
@ -35,12 +33,22 @@ 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 \ 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 script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h init.h
ifdef USE_UPNP
INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215" bitcoin.exe: USE_UPNP:=1
LIBPATHS += -L"C:\upnpc-exe-win32-20110215" ifdef USE_UPNP
LIBS += -l miniupnpc -l iphlpapi INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215"
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) LIBPATHS += -L"C:\upnpc-exe-win32-20110215"
endif 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
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 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

17
src/makefile.osx
View File

@ -16,8 +16,6 @@ LIBPATHS= \
WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static) WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
USE_UPNP:=0
LIBS= -dead_strip \ LIBS= -dead_strip \
$(DEPSDIR)/lib/libdb_cxx-4.8.a \ $(DEPSDIR)/lib/libdb_cxx-4.8.a \
$(DEPSDIR)/lib/libboost_system.a \ $(DEPSDIR)/lib/libboost_system.a \
@ -49,10 +47,17 @@ OBJS= \
cryptopp/obj/sha.o \ cryptopp/obj/sha.o \
cryptopp/obj/cpu.o cryptopp/obj/cpu.o
ifdef USE_UPNP bitcoin: USE_UPNP:=1
LIBS += $(DEPSDIR)/lib/libminiupnpc.a ifdef USE_UPNP
DEFS += -DUSE_UPNP=$(USE_UPNP) LIBS += $(DEPSDIR)/lib/libminiupnpc.a
endif 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 all: bitcoin

17
src/makefile.unix
View File

@ -8,8 +8,6 @@ WXINCLUDEPATHS=$(shell wx-config --cxxflags)
WXLIBS=$(shell wx-config --libs) WXLIBS=$(shell wx-config --libs)
USE_UPNP:=0
DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
# for boost 1.37, add -mt to the boost libraries # for boost 1.37, add -mt to the boost libraries
@ -23,10 +21,17 @@ LIBS= \
-l ssl \ -l ssl \
-l crypto -l crypto
ifdef USE_UPNP bitcoin: USE_UPNP:=1
LIBS += -l miniupnpc ifdef USE_UPNP
DEFS += -DUSE_UPNP=$(USE_UPNP) LIBS += -l miniupnpc
endif DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
bitcoind: USE_UPNP:=0
ifdef USE_UPNP
LIBS += -l miniupnpc
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif
LIBS+= \ LIBS+= \
-Wl,-Bdynamic \ -Wl,-Bdynamic \