![](https://bitcointalk.org/Themes/custom1/images/post/xx.gif) |
May 01, 2011, 05:55:54 AM |
|
Building without UPNP didn't work (on Linux), so I made the below changes. Two new #ifdef's, and you definitely can't define something :=0 and expect it to act as if undefined (GNU make).
I can make this into a github pull request later if need be.
Index: net.cpp =================================================================== --- net.cpp (revision 251) +++ net.cpp (working copy) @@ -887,6 +887,7 @@ printf("ThreadMapPort exiting\n"); } +#ifdef USE_UPNP void ThreadMapPort2(void* parg) { printf("ThreadMapPort started\n"); @@ -947,6 +948,7 @@ } } } +#endif void MapPort(bool fMapPort) { Index: makefile.unix =================================================================== --- makefile.unix (revision 251) +++ makefile.unix (working copy) @@ -8,7 +8,7 @@ WXLIBS=$(shell wx-config --libs) -USE_UPNP:=0 +#USE_UPNP:=1 DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL Index: db.cpp =================================================================== --- db.cpp (revision 251) +++ db.cpp (working copy) @@ -807,8 +807,10 @@ printf("fMinimizeOnClose = %d\n", fMinimizeOnClose); printf("fUseProxy = %d\n", fUseProxy); printf("addrProxy = %s\n", addrProxy.ToString().c_str()); +#ifdef USE_UPNP if (fHaveUPnP) printf("fUseUPnP = %d\n", fUseUPnP); +#endif // Upgrade
|