highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-03 09:43:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a259baa' into 0.6.0.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-08-26 22:15:56 +00:00
parent 94db8f97d4 a259baa955
commit 7c08c1a5df
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/makefile.linux-mingw
View File

@@ -31,7 +31,10 @@ DEBUGFLAGS=-g
CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
ifdef USE_UPNP
ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
LIBS += -l miniupnpc -l iphlpapi
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)