diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2011-09-29 15:02:12 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-02 09:40:17 +0200 |
| commit | 5d3083c3fbd3ab4999bb01e4987920d91e78fb7c (patch) | |
| tree | 785db44abc619caf7ec9b2d3d2ecc6fd1db4a175 /bitcoin-qt.pro | |
| parent | 608dacf6895223159bff6a342fdbe581187c8b4b (diff) | |
| download | bitcoin-5d3083c3fbd3ab4999bb01e4987920d91e78fb7c.tar.xz | |
Bugfix: Restore old behaviour of USE_UPNP as close as possible (built & enabled by default, can be disabled or unsupported by option)
Diffstat (limited to 'bitcoin-qt.pro')
| -rw-r--r-- | bitcoin-qt.pro | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 8c494dd92d..a603549720 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -16,10 +16,17 @@ OBJECTS_DIR = build MOC_DIR = build UI_DIR = build -# use: qmake "USE_UPNP=0" (disable by default) or "USE_UPNP=1" (enable by default) -# miniupnpc (http://miniupnp.free.fr/files/) must be installed -count(USE_UPNP, 1) { +# use: qmake "USE_UPNP=1" ( enabled by default; default) +# or: qmake "USE_UPNP=0" (disabled by default) +# or: qmake "USE_UPNP=-" (not supported) +# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support +contains(USE_UPNP, -) { + message(Building without UPNP support) +} else { message(Building with UPNP support) + count(USE_UPNP, 0) { + USE_UPNP=1 + } DEFINES += USE_UPNP=$$USE_UPNP LIBS += -lminiupnpc } |