zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile switch for which networking code to use

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@364 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-11-28 22:53:11 +00:00
parent 8727166e24
commit 44fcea85a8
6 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/build/Makefile
View file

@ -17,6 +17,7 @@ SUPERBUILD ?= 1
POLYMOST ?= 1
USE_OPENGL ?= 1
NOASM ?= 0
TESTNET ?= 0
SETSPRITEZ ?= 0
@ -84,7 +85,6 @@ ENGINEOBJS+= \
$(OBJ)/lzf_c.$o \
$(OBJ)/lzf_d.$o \
$(OBJ)/md4.$o \
$(OBJ)/mmultirm.$o \
$(OBJ)/osd.$o \
$(OBJ)/pragmas.$o \
$(OBJ)/scriptfile.$o \
@ -93,6 +93,12 @@ ENGINEOBJS+= \
EDITOROBJS=$(OBJ)/build.$o \
$(OBJ)/config.$o
ifeq ($(TESTNET),1)
ENGINEOBJS+= $(OBJ)/mmultirm.$o
else
ENGINEOBJS+= $(OBJ)/mmulti.$o
endif
# detect the platform
ifeq ($(PLATFORM),LINUX)
ASFLAGS+= -f elf

4
polymer/build/Makefile.deps
View file

@ -17,8 +17,8 @@ $(OBJ)/lzf_d.$o: $(SRC)/lzf_d.c $(SRC)/lzfP.h
$(OBJ)/lzwnew.$o: $(SRC)/lzwnew.c
$(OBJ)/md4.$o: $(SRC)/md4.c $(INC)/md4.h $(INC)/compat.h
$(OBJ)/mmulti_null.$o: $(SRC)/mmulti_null.c $(INC)/mmulti.h
$(OBJ)/mmulti.$o: $(SRC)/mmulti.c
$(OBJ)/mmultirm.$o: $(SRC)/mmultirm.c
$(OBJ)/mmulti.$o: $(SRC)/mmulti.c $(INC)/mmulti.h
$(OBJ)/mmultirm.$o: $(SRC)/mmultirm.c $(INC)/mmulti.h
$(OBJ)/osd.$o: $(SRC)/osd.c $(INC)/build.h $(INC)/osd.h $(INC)/compat.h $(INC)/baselayer.h
$(OBJ)/pragmas.$o: $(SRC)/pragmas.c $(INC)/compat.h
$(OBJ)/scriptfile.$o: $(SRC)/scriptfile.c $(INC)/scriptfile.h $(INC)/cache1d.h $(INC)/compat.h

4
polymer/build/Makefile.shared
View file

@ -152,4 +152,6 @@ endif
ifneq (0,$(SETSPRITEZ))
BUILDCFLAGS+= -DSETSPRITEZ
endif
ifneq (0,$(TESTNET))
BUILDCFLAGS+= -DTESTNET
endif

2
polymer/build/src/mmultirm.c
View file

@ -1112,7 +1112,7 @@ static int connect_to_everyone(gcomtype *gcom, int myip, int bcast)
{
////addfaz NAT addition *START*////
if (!natfree)
if (natfree)
{
if (tmpmax[i] != 1)
{

3
polymer/eduke32/Makefile
View file

@ -13,6 +13,7 @@ NOASM = 0
RELEASE?=1
JFAUD?=0
NOSOUND?=0
TESTNET?=0
# build locations
@ -210,7 +211,7 @@ enginelib editorlib:
-mkdir -p $(EOBJ)
$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
USE_OPENGL=$(USE_OPENGL) \
USE_OPENGL=$(USE_OPENGL) TESTNET=$(TESTNET) \
NOASM=$(NOASM) RELEASE=$(RELEASE) $@
$(EOBJ)/$(ENGINELIB): enginelib

12
polymer/eduke32/source/game.c
View file

@ -121,8 +121,6 @@ char user_quote[MAXUSERQUOTES][178];
#define MAXCACHE1DSIZE (32*1048576)
#endif
#define RMNET 1
long tempwallptr;
long nonsharedtimer;
@ -8206,6 +8204,7 @@ void comlinehelp(void)
wm_msgbox(apptitle,s);
}
#ifndef TESTNET
signed int rancid_players = 0;
char rancid_ip_strings[MAXPLAYERS][32], rancid_local_port_string[8];
@ -8279,6 +8278,7 @@ static int stringsort(const char *p1, const char *p2)
{
return Bstrcmp(&p1[0],&p2[0]);
}
#endif
static tokenlist grptokens[] =
{
@ -8416,12 +8416,12 @@ void checkcommandline(int argc,char **argv)
{
NoSetup = TRUE;
networkmode = 1;
#ifndef RMNET
#ifndef TESTNET
CommandNet = argv[i+1];
#endif
i++;
}
#ifndef RMNET
#ifndef TESTNET
if (CommandNet)
{
if (load_rancid_net(CommandNet) != -1)
@ -9293,7 +9293,7 @@ void Startup(long argc, char **argv)
for (i=0;i<MAXPLAYERS;i++)
playerreadyflag[i] = 0;
#ifndef RMNET
#ifndef TESTNET
if (Bstrlen(rancid_ip_strings[MAXPLAYERS-1]))
{
initprintf("rmnet: Using %s as sort IP\n",rancid_ip_strings[MAXPLAYERS-1]);
@ -9743,7 +9743,7 @@ void app_main(int argc,char **argv)
// initprintf("numplayers=%i\n",numplayers);
#ifdef RMNET
#ifdef TESTNET
if (natfree)
waitforeverybody();
#endif