Skip to content
Snippets Groups Projects
Commit d4ab2837 authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'master' into next

parents ab0fe6b1 1f2d7203
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
src/win32/Makefile.cfg
+ 2
− 0
View file @ d4ab2837
...@@ -24,8 +24,10 @@ ifndef NOASM ...@@ -24,8 +24,10 @@ ifndef NOASM
USEASM=1 USEASM=1
endif endif
ifndef NONET
ifndef MINGW64 #miniupnc is broken with MINGW64 ifndef MINGW64 #miniupnc is broken with MINGW64
HAVE_MINIUPNPC=1 HAVE_MINIUPNPC=1
endif
endif endif
OPTS=-DSTDC_HEADERS OPTS=-DSTDC_HEADERS
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment