Skip to content
Snippets Groups Projects
Commit 1f2d7203 authored by wolfs's avatar wolfs
Browse files

Merge branch 'nonet-upnp' into 'master'

Don't enable UPnP support if NONET is defined.

See merge request STJr/SRB2!484
parents 6d95f3ce 26fdee82
No related branches found
No related tags found
2 merge requests!488Merge in next and don't billboard papersprites in GL,!484Don't enable UPnP support if NONET is defined.
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment