diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-08 16:36:40 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-24 03:42:16 +0000 |
| commit | 5ebc1680062f6e6fc6352c4c8ccb1f746f6a280e (patch) | |
| tree | da8081c4ae0b78d6a671d8a59af2e9ea2ea8a2d7 /src | |
| parent | 08344c735feddc8d6cbeb63b18f3fc1fd4544170 (diff) | |
Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.linux-mingw | 5 | ||||
| -rw-r--r-- | src/makefile.mingw | 5 | ||||
| -rw-r--r-- | src/makefile.osx | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index fa46d080bb..41dbf2a9fc 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -53,7 +53,10 @@ HEADERS = \ wallet.h -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) diff --git a/src/makefile.mingw b/src/makefile.mingw index 5e9a4427f1..75d3992f8a 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -49,7 +49,10 @@ HEADERS = \ util.h \ wallet.h -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 diff --git a/src/makefile.osx b/src/makefile.osx index cbd51b049f..5e9236fd73 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -91,7 +91,10 @@ OBJS= \ obj/util.o \ obj/wallet.o -ifdef USE_UPNP +ifndef USE_UPNP + override USE_UPNP = - +endif +ifneq (${USE_UPNP}, -) DEFS += -DUSE_UPNP=$(USE_UPNP) ifdef STATIC LIBS += $(DEPSDIR)/lib/libminiupnpc.a |