Merge branch 'DD_netplay_off' into 'next'

DIsable NetPlay on DirectDraw builds

Also disable UPnP support on NONET builds

See merge request !102
This commit is contained in:
Wolfy committed 2016-09-04 19:01:26 -04:00
commit bcf7ca421c
2 files changed
+4 -1

No files matched your search

+1
View File
@@ -60,6 +60,7 @@
#endif
#ifdef _WINDOWS
#define NONET
#if !defined (HWRENDER) && !defined (NOHW)
#define HWRENDER
#endif
+3 -1
View File
@@ -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__)