Merge branch 'DD_netplay_off' into 'next'

DIsable NetPlay on DirectDraw builds Also disable UPnP support on NONET builds See merge request !102
2016-09-04 19:01:26 -04:00 · 2016-09-04 19:01:26 -04:00 · bcf7ca421c
parent cce2a5e048 bdb5db878a
commit bcf7ca421c
2 changed files with 4 additions and 1 deletions
--- a/src/doomdef.h
+++ b/src/doomdef.h
@ -60,6 +60,7 @@
 #endif

 #ifdef _WINDOWS
+#define NONET
 #if !defined (HWRENDER) && !defined (NOHW)
 #define HWRENDER
 #endif
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@ -56,7 +56,9 @@
 //#define NONET
 #endif

-#ifndef NONET
+#ifdef NONET
+#undef HAVE_MINIUPNPC
+#else
 #ifdef USE_WINSOCK1
 #include <winsock.h>
 #elif !defined (SCOUW2) && !defined (SCOUW7) && !defined (__OS2__)