Merge branch 'nonet-upnp' into 'master'

Don't enable UPnP support if NONET is defined. See merge request STJr/SRB2!484
2019-05-03 06:40:22 -04:00 · 2019-05-03 06:40:22 -04:00 · 1f2d720363
parent 6d95f3ceb2 26fdee8217
commit 1f2d720363
1 changed files with 2 additions and 0 deletions
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@ -24,8 +24,10 @@ ifndef NOASM
 	USEASM=1
 endif

+ifndef NONET
 ifndef MINGW64 #miniupnc is broken with MINGW64
 	HAVE_MINIUPNPC=1
+endif
 endif

 	OPTS=-DSTDC_HEADERS