mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-15 09:11:48 +00:00
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:
commit
bcf7ca421c
2 changed files with 4 additions and 1 deletions
|
@ -60,6 +60,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WINDOWS
|
#ifdef _WINDOWS
|
||||||
|
#define NONET
|
||||||
#if !defined (HWRENDER) && !defined (NOHW)
|
#if !defined (HWRENDER) && !defined (NOHW)
|
||||||
#define HWRENDER
|
#define HWRENDER
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -56,7 +56,9 @@
|
||||||
//#define NONET
|
//#define NONET
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NONET
|
#ifdef NONET
|
||||||
|
#undef HAVE_MINIUPNPC
|
||||||
|
#else
|
||||||
#ifdef USE_WINSOCK1
|
#ifdef USE_WINSOCK1
|
||||||
#include <winsock.h>
|
#include <winsock.h>
|
||||||
#elif !defined (SCOUW2) && !defined (SCOUW7) && !defined (__OS2__)
|
#elif !defined (SCOUW2) && !defined (SCOUW7) && !defined (__OS2__)
|
||||||
|
|
Loading…
Reference in a new issue