diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-26 22:15:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-26 22:15:56 +0000 |
| commit | 7c08c1a5df691685b9de8c6d1088bb792b079d58 (patch) | |
| tree | bcaed6231db9f2a6a40e40276dac21828204611c /src/makefile.mingw | |
| parent | 94db8f97d4a2d9bc8e1f90867630b624367d5b4b (diff) | |
| parent | a259baa9557af63cca220802ee45be4f4b54ac90 (diff) | |
| download | bitcoin-7c08c1a5df691685b9de8c6d1088bb792b079d58.tar.xz | |
Merge commit 'a259baa' into 0.6.0.x
Diffstat (limited to 'src/makefile.mingw')
| -rw-r--r-- | src/makefile.mingw | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/makefile.mingw b/src/makefile.mingw index 7496e0a929..1d027fa9e4 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -28,7 +28,10 @@ DEBUGFLAGS=-g CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -ifdef USE_UPNP +ifndef USE_UPNP + override USE_UPNP = - +endif +ifneq (${USE_UPNP}, -) INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw" LIBPATHS += -L"C:\miniupnpc-1.6-mgw" LIBS += -l miniupnpc -l iphlpapi |