Merge branch 'master' into next

This commit is contained in:
Monster Iestyn 2019-05-03 16:00:45 +01:00
commit d4ab2837bb
1 changed files with 2 additions and 0 deletions

View File

@ -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