mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2025-02-23 12:11:27 +00:00
Cleaning house
This commit is contained in:
Richard Allen
parent
608b8296b7
commit
608f518903
2 changed files with 0 additions and 707 deletions
|
|
@ -1,354 +0,0 @@
|
|||
#
|
||||
# Quake3 Unix Makefile
|
||||
#
|
||||
# GNU Make required
|
||||
#
|
||||
|
||||
|
||||
# --Makefile variables--
|
||||
|
||||
MOUNT_DIR=.
|
||||
ifndef Q3A_DIR
|
||||
Q3A_DIR=/home/ra/.q3a
|
||||
endif
|
||||
MOD_DIR=reaction
|
||||
|
||||
# --object list--
|
||||
GOBJ = \
|
||||
$(GDIRNAME)/g_main.o \
|
||||
$(GDIRNAME)/bg_misc.o \
|
||||
$(GDIRNAME)/bg_pmove.o \
|
||||
$(GDIRNAME)/bg_slidemove.o \
|
||||
$(GDIRNAME)/q_math.o \
|
||||
$(GDIRNAME)/q_shared.o \
|
||||
$(GDIRNAME)/ai_dmnet.o \
|
||||
$(GDIRNAME)/ai_dmq3.o \
|
||||
$(GDIRNAME)/ai_main.o \
|
||||
$(GDIRNAME)/ai_chat.o \
|
||||
$(GDIRNAME)/ai_cmd.o \
|
||||
$(GDIRNAME)/ai_team.o \
|
||||
$(GDIRNAME)/g_active.o \
|
||||
$(GDIRNAME)/g_arenas.o \
|
||||
$(GDIRNAME)/g_bot.o \
|
||||
$(GDIRNAME)/g_client.o \
|
||||
$(GDIRNAME)/g_cmds.o \
|
||||
$(GDIRNAME)/g_combat.o \
|
||||
$(GDIRNAME)/g_items.o \
|
||||
$(GDIRNAME)/g_mem.o \
|
||||
$(GDIRNAME)/g_misc.o \
|
||||
$(GDIRNAME)/g_missile.o \
|
||||
$(GDIRNAME)/g_mover.o \
|
||||
$(GDIRNAME)/g_session.o \
|
||||
$(GDIRNAME)/g_spawn.o \
|
||||
$(GDIRNAME)/g_svcmds.o \
|
||||
$(GDIRNAME)/g_target.o \
|
||||
$(GDIRNAME)/g_team.o \
|
||||
$(GDIRNAME)/g_trigger.o \
|
||||
$(GDIRNAME)/g_utils.o \
|
||||
$(GDIRNAME)/g_weapon.o \
|
||||
$(GDIRNAME)/g_fileio.o \
|
||||
$(GDIRNAME)/ai_vcmd.o \
|
||||
$(GDIRNAME)/rxn_game.o \
|
||||
$(GDIRNAME)/g_teamplay.o \
|
||||
$(GDIRNAME)/g_matchmode.o \
|
||||
$(GDIRNAME)/g_unlagged.o \
|
||||
$(GDIRNAME)/g_scripts.o \
|
||||
$(GDIRNAME)/g_parser.o \
|
||||
$(GDIRNAME)/zcam.o \
|
||||
$(GDIRNAME)/zcam_target.o
|
||||
|
||||
CGOBJ = \
|
||||
$(CGDIRNAME)/cg_main.o \
|
||||
$(GDIRNAME)/bg_misc.o \
|
||||
$(GDIRNAME)/bg_pmove.o \
|
||||
$(GDIRNAME)/bg_slidemove.o \
|
||||
$(GDIRNAME)/q_math.o \
|
||||
$(GDIRNAME)/q_shared.o \
|
||||
$(CGDIRNAME)/cg_consolecmds.o \
|
||||
$(CGDIRNAME)/cg_draw.o \
|
||||
$(CGDIRNAME)/cg_drawtools.o \
|
||||
$(CGDIRNAME)/cg_effects.o \
|
||||
$(CGDIRNAME)/cg_ents.o \
|
||||
$(CGDIRNAME)/cg_event.o \
|
||||
$(CGDIRNAME)/cg_info.o \
|
||||
$(CGDIRNAME)/cg_localents.o \
|
||||
$(CGDIRNAME)/cg_marks.o \
|
||||
$(CGDIRNAME)/cg_players.o \
|
||||
$(CGDIRNAME)/cg_playerstate.o \
|
||||
$(CGDIRNAME)/cg_predict.o \
|
||||
$(CGDIRNAME)/cg_scoreboard.o \
|
||||
$(CGDIRNAME)/cg_servercmds.o \
|
||||
$(CGDIRNAME)/cg_snapshot.o \
|
||||
$(CGDIRNAME)/cg_view.o \
|
||||
$(CGDIRNAME)/cg_atmospheric.o \
|
||||
$(CGDIRNAME)/cg_unlagged.o \
|
||||
$(CGDIRNAME)/cg_weapons.o
|
||||
|
||||
UIOBJ = \
|
||||
$(UIDIRNAME)/ui_main.o \
|
||||
$(GDIRNAME)/bg_misc.o \
|
||||
$(GDIRNAME)/q_math.o \
|
||||
$(GDIRNAME)/q_shared.o \
|
||||
$(UIDIRNAME)/ui_gameinfo.o \
|
||||
$(UIDIRNAME)/ui_atoms.o \
|
||||
$(UIDIRNAME)/ui_players.o \
|
||||
$(UIDIRNAME)/ui_shared.o \
|
||||
$(UIDIRNAME)/ui_util.o
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# --You shouldn't have to touch anything below here--
|
||||
|
||||
# --general variables--
|
||||
PLATFORM=$(shell uname|tr A-Z a-z)
|
||||
PLATFORM_RELEASE=$(shell uname -r)
|
||||
|
||||
BD=debug$(ARCH)$(GLIBC)
|
||||
BR=release$(ARCH)$(GLIBC)
|
||||
BQ=qvm
|
||||
|
||||
GDIRNAME=game
|
||||
CGDIRNAME=cgame
|
||||
UIDIRNAME=ui
|
||||
GDIR=$(MOUNT_DIR)/$(GDIRNAME)
|
||||
CGDIR=$(MOUNT_DIR)/$(CGDIRNAME)
|
||||
UIDIR=$(MOUNT_DIR)/$(UIDIRNAME)
|
||||
|
||||
|
||||
# --gcc config--
|
||||
ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6* ];then echo libc6;fi)))
|
||||
GLIBC=-glibc
|
||||
else
|
||||
GLIBC=
|
||||
endif #libc6 test
|
||||
|
||||
|
||||
ifneq (,$(findstring alpha,$(shell uname -m)))
|
||||
ARCH=axp
|
||||
RPMARCH=alpha
|
||||
VENDOR=dec
|
||||
else #default to i386
|
||||
ARCH=i386
|
||||
RPMARCH=i386
|
||||
VENDOR=unknown
|
||||
endif #alpha test
|
||||
|
||||
BASE_CFLAGS=-pipe
|
||||
DEBUG_CFLAGS=$(BASE_CFLAGS) -g -pg -Wall
|
||||
DEPEND_CFLAGS= -MM
|
||||
|
||||
ifeq ($(ARCH),axp)
|
||||
CC=pgcc
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
|
||||
else
|
||||
NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc
|
||||
CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo gcc; fi )
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce
|
||||
endif
|
||||
|
||||
LIBEXT=a
|
||||
|
||||
SHLIBEXT=so
|
||||
SHLIBCFLAGS=-fPIC
|
||||
SHLIBLDFLAGS=-shared
|
||||
|
||||
ARFLAGS=ar rv
|
||||
RANLIB=ranlib
|
||||
|
||||
THREAD_LDFLAGS=-lpthread
|
||||
LDFLAGS=-ldl -lm
|
||||
|
||||
SED=sed
|
||||
|
||||
|
||||
|
||||
# --qvm building config--
|
||||
LCC=q3lcc
|
||||
LCC_FLAGS=-DQ3_VM -S -Wf-target=bytecode -Wf-O2
|
||||
LCC_INCLUDES=-I$(CGDIR) -I$(GDIR) -I$(UIDIR)
|
||||
|
||||
Q3ASM=q3asm
|
||||
Q3ASM_FLAGS=
|
||||
|
||||
|
||||
|
||||
# --main targets--
|
||||
#all: release debug qvm
|
||||
all: qvm
|
||||
|
||||
release: ctags makedirs $(BR)/cgame$(ARCH).$(SHLIBEXT) $(BR)/qagame$(ARCH).$(SHLIBEXT) $(BR)/ui$(ARCH).$(SHLIBEXT)
|
||||
|
||||
debug: ctags makedirs $(BD)/cgame$(ARCH).$(SHLIBEXT) $(BD)/qagame$(ARCH).$(SHLIBEXT) $(BD)/ui$(ARCH).$(SHLIBEXT)
|
||||
|
||||
qvm: ctags makedirs $(BQ)/cgame.qvm $(BQ)/qagame.qvm $(BQ)/ui.qvm
|
||||
|
||||
makedirs:
|
||||
@if [ ! -d $(BR) ];then mkdir $(BR);fi
|
||||
@if [ ! -d $(BR)/$(GDIRNAME) ];then mkdir $(BR)/$(GDIRNAME);fi
|
||||
@if [ ! -d $(BR)/$(CGDIRNAME) ];then mkdir $(BR)/$(CGDIRNAME);fi
|
||||
@if [ ! -d $(BR)/$(UIDIRNAME) ];then mkdir $(BR)/$(UIDIRNAME);fi
|
||||
@if [ ! -d $(BD) ];then mkdir $(BD);fi
|
||||
@if [ ! -d $(BD)/$(GDIRNAME) ];then mkdir $(BD)/$(GDIRNAME);fi
|
||||
@if [ ! -d $(BD)/$(CGDIRNAME) ];then mkdir $(BD)/$(CGDIRNAME);fi
|
||||
@if [ ! -d $(BD)/$(UIDIRNAME) ];then mkdir $(BD)/$(UIDIRNAME);fi
|
||||
@if [ ! -d $(BQ) ];then mkdir $(BQ);fi
|
||||
@if [ ! -d $(BQ)/$(GDIRNAME) ];then mkdir $(BQ)/$(GDIRNAME);fi
|
||||
@if [ ! -d $(BQ)/$(CGDIRNAME) ];then mkdir $(BQ)/$(CGDIRNAME);fi
|
||||
@if [ ! -d $(BQ)/$(UIDIRNAME) ];then mkdir $(BQ)/$(UIDIRNAME);fi
|
||||
|
||||
ctags:
|
||||
# ctags -f tags -R *
|
||||
|
||||
# --object lists for each build type--
|
||||
GQVMOBJ = $(GOBJ:%.o=$(BQ)/%.asm)
|
||||
GROBJ = $(GOBJ:%.o=$(BR)/%.o) $(BR)/$(GDIRNAME)/g_syscalls.o
|
||||
GDOBJ = $(GOBJ:%.o=$(BD)/%.o) $(BD)/$(GDIRNAME)/g_syscalls.o
|
||||
|
||||
CGQVMOBJ = $(CGOBJ:%.o=$(BQ)/%.asm)
|
||||
CGROBJ = $(CGOBJ:%.o=$(BR)/%.o) $(BR)/$(CGDIRNAME)/cg_syscalls.o
|
||||
CGDOBJ = $(CGOBJ:%.o=$(BD)/%.o) $(BD)/$(CGDIRNAME)/cg_syscalls.o
|
||||
|
||||
UIQVMOBJ = $(UIOBJ:%.o=$(BQ)/%.asm)
|
||||
UIROBJ = $(UIOBJ:%.o=$(BR)/%.o) $(BR)/$(UIDIRNAME)/ui_syscalls.o
|
||||
UIDOBJ = $(UIOBJ:%.o=$(BD)/%.o) $(BD)/$(UIDIRNAME)/ui_syscalls.o
|
||||
|
||||
|
||||
|
||||
# --rules for the shared objects--
|
||||
#release qagamei386.so
|
||||
$(BR)/qagame$(ARCH).$(SHLIBEXT) : $(GROBJ)
|
||||
$(CC) $(RELEASE_CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GROBJ)
|
||||
|
||||
#debug qagamei386.so
|
||||
$(BD)/qagame$(ARCH).$(SHLIBEXT) : $(GDOBJ)
|
||||
$(CC) $(DEBUG_CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GDOBJ)
|
||||
|
||||
#qvm qagame.qvm
|
||||
$(BQ)/qagame.qvm : $(GQVMOBJ) $(BQ)/$(GDIRNAME)/bg_lib.asm
|
||||
$(Q3ASM) $(Q3ASM_FLAGS) -o $@ $(GQVMOBJ) $(GDIR)/g_syscalls.asm $(BQ)/$(GDIRNAME)/bg_lib.asm
|
||||
|
||||
|
||||
#release cgamei386.so
|
||||
$(BR)/cgame$(ARCH).$(SHLIBEXT) : $(CGROBJ)
|
||||
$(CC) $(RELEASE_CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CGROBJ)
|
||||
|
||||
#debug cgamei386.so
|
||||
$(BD)/cgame$(ARCH).$(SHLIBEXT) : $(CGDOBJ)
|
||||
$(CC) $(DEBUG_CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CGDOBJ)
|
||||
|
||||
#qvm cgame.qvm
|
||||
$(BQ)/cgame.qvm : $(CGQVMOBJ) $(BQ)/$(GDIRNAME)/bg_lib.asm
|
||||
$(Q3ASM) $(Q3ASM_FLAGS) -o $@ $(CGQVMOBJ) $(CGDIR)/cg_syscalls.asm $(BQ)/$(GDIRNAME)/bg_lib.asm
|
||||
|
||||
|
||||
#release uii386.so
|
||||
$(BR)/ui$(ARCH).$(SHLIBEXT) : $(UIROBJ)
|
||||
$(CC) $(RELEASE_CFLAGS) $(SHLIBLDFLAGS) -o $@ $(UIROBJ)
|
||||
|
||||
#debug cgamei386.so
|
||||
$(BD)/ui$(ARCH).$(SHLIBEXT) : $(UIDOBJ)
|
||||
$(CC) $(DEBUG_CFLAGS) $(SHLIBLDFLAGS) -o $@ $(UIDOBJ)
|
||||
|
||||
#qvm ui.qvm
|
||||
$(BQ)/ui.qvm: $(UIQVMOBJ) $(BQ)/$(GDIRNAME)/bg_lib.asm
|
||||
$(Q3ASM) $(Q3ASM_FLAGS) -o $@ $(UIQVMOBJ) $(UIDIR)/ui_syscalls.asm $(BQ)/$(GDIRNAME)/bg_lib.asm
|
||||
|
||||
|
||||
|
||||
# --rules for the objects--
|
||||
#release g_*.o
|
||||
$(BR)/$(GDIRNAME)/%.o: $(GDIR)/%.c
|
||||
$(CC) $(RELEASE_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
|
||||
|
||||
#debug g_*.o
|
||||
$(BD)/$(GDIRNAME)/%.o: $(GDIR)/%.c
|
||||
$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
|
||||
|
||||
#qvm g_*.asm
|
||||
$(BQ)/$(GDIRNAME)/%.asm: $(GDIR)/%.c
|
||||
$(LCC) $(LCC_FLAGS) $(LCC_INCLUDES) -o $@ $<
|
||||
|
||||
#release cg_*.o
|
||||
$(BR)/$(CGDIRNAME)/%.o: $(CGDIR)/%.c
|
||||
$(CC) $(RELEASE_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
|
||||
|
||||
#debug cg_*.o
|
||||
$(BD)/$(CGDIRNAME)/%.o: $(CGDIR)/%.c
|
||||
$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
|
||||
|
||||
#qvm cg_*.asm
|
||||
$(BQ)/$(CGDIRNAME)/%.asm: $(CGDIR)/%.c
|
||||
$(LCC) $(LCC_FLAGS) $(LCC_INCLUDES) -o $@ $<
|
||||
|
||||
#release ui_*.o
|
||||
$(BR)/$(UIDIRNAME)/%.o: $(UIDIR)/%.c
|
||||
$(CC) $(RELEASE_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
|
||||
|
||||
#debug ui_*.o
|
||||
$(BD)/$(UIDIRNAME)/%.o: $(UIDIR)/%.c
|
||||
$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
|
||||
|
||||
#qvm ui_*.asm
|
||||
$(BQ)/$(UIDIRNAME)/%.asm: $(UIDIR)/%.c
|
||||
$(LCC) $(LCC_FLAGS) $(LCC_INCLUDES) -o $@ $<
|
||||
|
||||
|
||||
# --cleaning rules--
|
||||
clean:clean-debug clean-release clean-qvm
|
||||
|
||||
clean-debug:
|
||||
rm -f $(BD)/$(GDIRNAME)/*.o
|
||||
rm -f $(BD)/$(CGDIRNAME)/*.o
|
||||
rm -f $(BD)/$(UIDIRNAME)/*.o
|
||||
|
||||
clean-release:
|
||||
rm -f $(BR)/$(GDIRNAME)/*.o
|
||||
rm -f $(BR)/$(CGDIRNAME)/*.o
|
||||
rm -f $(BR)/$(UIDIRNAME)/*.o
|
||||
|
||||
clean-qvm:
|
||||
rm -f $(BQ)/$(GDIRNAME)/*.asm
|
||||
rm -f $(BQ)/$(CGDIRNAME)/*.asm
|
||||
rm -f $(BQ)/$(UIDIRNAME)/*.asm
|
||||
|
||||
|
||||
|
||||
# --installing rules--
|
||||
install-release:release
|
||||
@if [ ! -d $(Q3A_DIR) ];then mkdir $(Q3A_DIR);fi
|
||||
@if [ ! -d $(Q3A_DIR)/$(MOD_DIR) ];then mkdir $(Q3A_DIR)/$(MOD_DIR);fi
|
||||
cp $(BR)/*.so $(Q3A_DIR)/$(MOD_DIR)
|
||||
|
||||
install-debug:debug
|
||||
@if [ ! -d $(Q3A_DIR) ];then mkdir $(Q3A_DIR);fi
|
||||
@if [ ! -d $(Q3A_DIR)/$(MOD_DIR) ];then mkdir $(Q3A_DIR)/$(MOD_DIR);fi
|
||||
cp $(BD)/*.so $(Q3A_DIR)/$(MOD_DIR)
|
||||
|
||||
install-qvm:qvm
|
||||
@if [ ! -d $(Q3A_DIR) ];then mkdir $(Q3A_DIR);fi
|
||||
@if [ ! -d $(Q3A_DIR)/$(MOD_DIR) ];then mkdir $(Q3A_DIR)/$(MOD_DIR);fi
|
||||
@if [ ! -d $(Q3A_DIR)/$(MOD_DIR)/vm ];then mkdir $(Q3A_DIR)/$(MOD_DIR)/vm;fi
|
||||
cp $(BQ)/*.qvm $(Q3A_DIR)/$(MOD_DIR)/vm
|
||||
cd $(Q3A_DIR)/$(MOD_DIR); zip -r zz-code.pk3 vm/*.qvm
|
||||
|
||||
|
||||
# --dependency rules--
|
||||
DEPEND_FILE=depend
|
||||
|
||||
depend:
|
||||
echo > $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(GDIR)/*.c | $(SED) -e 's/^\(.*\.o\)/$(BR)\/$(GDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(GDIR)/*.c | $(SED) -e 's/^\(.*\.o\)/$(BD)\/$(GDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(GDIR)/*.c | $(SED) -e 's/\.o/.asm/g' -e 's/^\(.*\.asm\)/$(BQ)\/$(GDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(CGDIR)/*.c | $(SED) -e 's/^\(.*\.o\)/$(BR)\/$(CGDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(CGDIR)/*.c | $(SED) -e 's/^\(.*\.o\)/$(BD)\/$(CGDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(CGDIR)/*.c | $(SED) -e 's/\.o/.asm/g' -e 's/^\(.*\.asm\)/$(BQ)\/$(CGDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(UIDIR)/*.c | $(SED) -e 's/^\(.*\.o\)/$(BR)\/$(UIDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(UIDIR)/*.c | $(SED) -e 's/^\(.*\.o\)/$(BD)\/$(UIDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
$(CC) $(DEPEND_CFLAGS) $(LCC_INCLUDES) $(UIDIR)/*.c | $(SED) -e 's/\.o/.asm/g' -e 's/^\(.*\.asm\)/$(BQ)\/$(UIDIRNAME)\/\1/g' >> $(DEPEND_FILE)
|
||||
|
||||
include $(DEPEND_FILE)
|
||||
|
||||
|
|
@ -1,353 +0,0 @@
|
|||
diff -ur ioquake3-real/code/client/cl_keys.c ioquake3/code/client/cl_keys.c
|
||||
--- ioquake3-real/code/client/cl_keys.c 2009-06-28 14:16:50.847500218 +0000
|
||||
+++ ioquake3/code/client/cl_keys.c 2009-06-28 15:46:03.995500836 +0000
|
||||
@@ -1417,7 +1417,7 @@
|
||||
|
||||
// This must not exceed MAX_CMD_LINE
|
||||
#define MAX_CONSOLE_SAVE_BUFFER 1024
|
||||
-#define CONSOLE_HISTORY_FILE "q3history"
|
||||
+#define CONSOLE_HISTORY_FILE "rq3history"
|
||||
static char consoleSaveBuffer[ MAX_CONSOLE_SAVE_BUFFER ];
|
||||
static int consoleSaveBufferSize = 0;
|
||||
|
||||
diff -ur ioquake3-real/code/client/snd_mem.c ioquake3/code/client/snd_mem.c
|
||||
--- ioquake3-real/code/client/snd_mem.c 2009-06-28 14:16:50.841500014 +0000
|
||||
+++ ioquake3/code/client/snd_mem.c 2009-06-28 16:35:32.579250311 +0000
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "snd_local.h"
|
||||
#include "snd_codec.h"
|
||||
|
||||
-#define DEF_COMSOUNDMEGS "8"
|
||||
+#define DEF_COMSOUNDMEGS "32"
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
diff -ur ioquake3-real/code/qcommon/common.c ioquake3/code/qcommon/common.c
|
||||
--- ioquake3-real/code/qcommon/common.c 2009-06-28 14:16:43.987498785 +0000
|
||||
+++ ioquake3/code/qcommon/common.c 2009-06-28 16:37:44.149250089 +0000
|
||||
@@ -37,9 +37,9 @@
|
||||
#define MAX_NUM_ARGVS 50
|
||||
|
||||
#define MIN_DEDICATED_COMHUNKMEGS 1
|
||||
-#define MIN_COMHUNKMEGS 56
|
||||
-#define DEF_COMHUNKMEGS 64
|
||||
-#define DEF_COMZONEMEGS 24
|
||||
+#define MIN_COMHUNKMEGS 256
|
||||
+#define DEF_COMHUNKMEGS 256
|
||||
+#define DEF_COMZONEMEGS 64
|
||||
#define DEF_COMHUNKMEGS_S XSTRING(DEF_COMHUNKMEGS)
|
||||
#define DEF_COMZONEMEGS_S XSTRING(DEF_COMZONEMEGS)
|
||||
|
||||
@@ -400,7 +400,7 @@
|
||||
Com_SafeMode
|
||||
|
||||
Check for "safe" on the command line, which will
|
||||
-skip loading of q3config.cfg
|
||||
+skip loading of Reaction.cfg
|
||||
===================
|
||||
*/
|
||||
qboolean Com_SafeMode( void ) {
|
||||
@@ -1397,7 +1397,7 @@
|
||||
void Com_InitZoneMemory( void ) {
|
||||
cvar_t *cv;
|
||||
|
||||
- //FIXME: 05/01/06 com_zoneMegs is useless right now as neither q3config.cfg nor
|
||||
+ //FIXME: 05/01/06 com_zoneMegs is useless right now as neither Reaction.cfg nor
|
||||
// Com_StartupVariable have been executed by this point. The net result is that
|
||||
// s_zoneTotal will always be set to the default value.
|
||||
|
||||
@@ -2568,7 +2568,7 @@
|
||||
|
||||
Cbuf_AddText ("exec default.cfg\n");
|
||||
|
||||
- // skip the q3config.cfg if "safe" is on the command line
|
||||
+ // skip the Reaction.cfg if "safe" is on the command line
|
||||
if ( !Com_SafeMode() ) {
|
||||
Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
|
||||
}
|
||||
diff -ur ioquake3-real/code/qcommon/files.c ioquake3/code/qcommon/files.c
|
||||
--- ioquake3-real/code/qcommon/files.c 2009-06-28 14:16:43.961499737 +0000
|
||||
+++ ioquake3/code/qcommon/files.c 2009-06-28 15:23:31.212499900 +0000
|
||||
@@ -160,7 +160,7 @@
|
||||
|
||||
Different version coexistance?
|
||||
|
||||
-When building a pak file, make sure a q3config.cfg isn't present in it,
|
||||
+When building a pak file, make sure a Reaction.cfg isn't present in it,
|
||||
or configs will never get loaded from disk!
|
||||
|
||||
todo:
|
||||
@@ -2854,6 +2854,7 @@
|
||||
Q3 media pak0.pk3, you'll want to remove this function
|
||||
===================
|
||||
*/
|
||||
+/* JBravo - Not...
|
||||
static void FS_CheckPak0( void )
|
||||
{
|
||||
searchpath_t *path;
|
||||
@@ -2946,6 +2947,8 @@
|
||||
if(foundPak & 1)
|
||||
Cvar_Set("com_standalone", "0");
|
||||
}
|
||||
+*/
|
||||
+
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -3319,7 +3322,7 @@
|
||||
FS_Startup( BASEGAME );
|
||||
|
||||
#ifndef STANDALONE
|
||||
- FS_CheckPak0( );
|
||||
+ // FS_CheckPak0( ); /* JBravo - Not... */
|
||||
#endif
|
||||
|
||||
// if we can't find default.cfg, assume that the paths are
|
||||
@@ -3354,7 +3357,7 @@
|
||||
FS_Startup( BASEGAME );
|
||||
|
||||
#ifndef STANDALONE
|
||||
- FS_CheckPak0( );
|
||||
+ // FS_CheckPak0( ); /* JBravo - Not... */
|
||||
#endif
|
||||
|
||||
// if we can't find default.cfg, assume that the paths are
|
||||
@@ -3377,7 +3380,7 @@
|
||||
}
|
||||
|
||||
if ( Q_stricmp(fs_gamedirvar->string, lastValidGame) ) {
|
||||
- // skip the q3config.cfg if "safe" is on the command line
|
||||
+ // skip the Reaction.cfg if "safe" is on the command line
|
||||
if ( !Com_SafeMode() ) {
|
||||
Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
|
||||
}
|
||||
diff -ur ioquake3-real/code/qcommon/qcommon.h ioquake3/code/qcommon/qcommon.h
|
||||
--- ioquake3-real/code/qcommon/qcommon.h 2009-06-28 14:16:43.978500294 +0000
|
||||
+++ ioquake3/code/qcommon/qcommon.h 2009-06-28 14:28:20.287261367 +0000
|
||||
@@ -577,9 +577,9 @@
|
||||
#define MAX_FILE_HANDLES 64
|
||||
|
||||
#ifdef DEDICATED
|
||||
-# define Q3CONFIG_CFG "q3config_server.cfg"
|
||||
+# define Q3CONFIG_CFG "Reaction_server.cfg"
|
||||
#else
|
||||
-# define Q3CONFIG_CFG "q3config.cfg"
|
||||
+# define Q3CONFIG_CFG "Reaction.cfg"
|
||||
#endif
|
||||
|
||||
qboolean FS_Initialized( void );
|
||||
diff -ur ioquake3-real/code/qcommon/q_shared.h ioquake3/code/qcommon/q_shared.h
|
||||
--- ioquake3-real/code/qcommon/q_shared.h 2009-06-28 14:16:43.954500383 +0000
|
||||
+++ ioquake3/code/qcommon/q_shared.h 2009-06-28 14:33:54.027499715 +0000
|
||||
@@ -27,17 +27,17 @@
|
||||
// A user mod should never modify this file
|
||||
|
||||
#ifdef STANDALONE
|
||||
- #define PRODUCT_NAME "iofoo3"
|
||||
- #define BASEGAME "foobar"
|
||||
- #define CLIENT_WINDOW_TITLE "changeme"
|
||||
- #define CLIENT_WINDOW_MIN_TITLE "changeme2"
|
||||
- #define GAMENAME_FOR_MASTER "iofoo3" // must NOT contain whitespaces
|
||||
+ #define PRODUCT_NAME "Reaction"
|
||||
+ #define BASEGAME "Boomstick"
|
||||
+ #define CLIENT_WINDOW_TITLE "Reaction"
|
||||
+ #define CLIENT_WINDOW_MIN_TITLE "Reaction"
|
||||
+ #define GAMENAME_FOR_MASTER "Reaction" // must NOT contain whitespaces
|
||||
#else
|
||||
- #define PRODUCT_NAME "ioq3"
|
||||
- #define BASEGAME "baseq3"
|
||||
- #define CLIENT_WINDOW_TITLE "ioquake3"
|
||||
- #define CLIENT_WINDOW_MIN_TITLE "ioq3"
|
||||
- #define GAMENAME_FOR_MASTER "Quake3Arena"
|
||||
+ #define PRODUCT_NAME "Reaction"
|
||||
+ #define BASEGAME "Boomstick"
|
||||
+ #define CLIENT_WINDOW_TITLE "Reaction"
|
||||
+ #define CLIENT_WINDOW_MIN_TITLE "Reaction"
|
||||
+ #define GAMENAME_FOR_MASTER "Reaction"
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
diff -ur ioquake3-real/code/sys/con_win32.c ioquake3/code/sys/con_win32.c
|
||||
--- ioquake3-real/code/sys/con_win32.c 2009-06-28 14:16:51.364500267 +0000
|
||||
+++ ioquake3/code/sys/con_win32.c 2009-06-28 14:44:01.764250910 +0000
|
||||
@@ -225,7 +225,7 @@
|
||||
GetConsoleScreenBufferInfo( qconsole_hout, &info );
|
||||
qconsole_attrib = info.wAttributes;
|
||||
|
||||
- SetConsoleTitle("ioquake3 Dedicated Server Console");
|
||||
+ SetConsoleTitle("Reaction Dedicated Server Console");
|
||||
|
||||
// make cursor invisible
|
||||
GetConsoleCursorInfo( qconsole_hout, &qconsole_orig_cursorinfo );
|
||||
diff -ur ioquake3-real/code/sys/sys_unix.c ioquake3/code/sys/sys_unix.c
|
||||
--- ioquake3-real/code/sys/sys_unix.c 2009-06-28 14:16:51.364500267 +0000
|
||||
+++ ioquake3/code/sys/sys_unix.c 2009-06-28 14:37:50.314260145 +0000
|
||||
@@ -54,9 +54,9 @@
|
||||
{
|
||||
Q_strncpyz( homePath, p, sizeof( homePath ) );
|
||||
#ifdef MACOS_X
|
||||
- Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );
|
||||
+ Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Reaction" );
|
||||
#else
|
||||
- Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
|
||||
+ Q_strcat( homePath, sizeof( homePath ), "/.Reaction" );
|
||||
#endif
|
||||
if( mkdir( homePath, 0777 ) )
|
||||
{
|
||||
diff -ur ioquake3-real/code/sys/sys_win32.c ioquake3/code/sys/sys_win32.c
|
||||
--- ioquake3-real/code/sys/sys_win32.c 2009-06-28 14:16:51.363500210 +0000
|
||||
+++ ioquake3/code/sys/sys_win32.c 2009-06-28 14:46:30.855250233 +0000
|
||||
@@ -75,7 +75,7 @@
|
||||
return NULL;
|
||||
}
|
||||
Q_strncpyz( homePath, szPath, sizeof( homePath ) );
|
||||
- Q_strcat( homePath, sizeof( homePath ), "\\Quake3" );
|
||||
+ Q_strcat( homePath, sizeof( homePath ), "\\Reaction" );
|
||||
FreeLibrary(shfolder);
|
||||
if( !CreateDirectory( homePath, NULL ) )
|
||||
{
|
||||
diff -ur ioquake3-real/cross-make-mingw.sh ioquake3/cross-make-mingw.sh
|
||||
--- ioquake3-real/cross-make-mingw.sh 2009-06-28 14:16:51.574500373 +0000
|
||||
+++ ioquake3/cross-make-mingw.sh 2009-06-28 16:03:40.041250838 +0000
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
-export CC=i586-mingw32msvc-gcc
|
||||
-export WINDRES=i586-mingw32msvc-windres
|
||||
+export CC=i386-mingw32-gcc
|
||||
+export WINDRES=i386-mingw32-windres
|
||||
export PLATFORM=mingw32
|
||||
exec make $*
|
||||
diff -ur ioquake3-real/Makefile ioquake3/Makefile
|
||||
--- ioquake3-real/Makefile 2009-06-28 14:16:51.582500273 +0000
|
||||
+++ ioquake3/Makefile 2009-06-28 16:47:38.620500852 +0000
|
||||
@@ -24,25 +24,25 @@
|
||||
endif
|
||||
|
||||
ifndef BUILD_STANDALONE
|
||||
- BUILD_STANDALONE =
|
||||
+ BUILD_STANDALONE = 1
|
||||
endif
|
||||
ifndef BUILD_CLIENT
|
||||
- BUILD_CLIENT =
|
||||
+ BUILD_CLIENT = 1
|
||||
endif
|
||||
ifndef BUILD_CLIENT_SMP
|
||||
- BUILD_CLIENT_SMP =
|
||||
+ BUILD_CLIENT_SMP = 1
|
||||
endif
|
||||
ifndef BUILD_SERVER
|
||||
- BUILD_SERVER =
|
||||
+ BUILD_SERVER = 1
|
||||
endif
|
||||
ifndef BUILD_GAME_SO
|
||||
- BUILD_GAME_SO =
|
||||
+ BUILD_GAME_SO = 0
|
||||
endif
|
||||
ifndef BUILD_GAME_QVM
|
||||
- BUILD_GAME_QVM =
|
||||
+ BUILD_GAME_QVM = 0
|
||||
endif
|
||||
ifndef BUILD_MISSIONPACK
|
||||
- BUILD_MISSIONPACK=
|
||||
+ BUILD_MISSIONPACK= 0
|
||||
endif
|
||||
|
||||
ifneq ($(PLATFORM),darwin)
|
||||
@@ -88,7 +88,7 @@
|
||||
export CROSS_COMPILING
|
||||
|
||||
ifndef COPYDIR
|
||||
-COPYDIR="/usr/local/games/quake3"
|
||||
+COPYDIR="/usr/local/games/Reaction"
|
||||
endif
|
||||
|
||||
ifndef MOUNT_DIR
|
||||
@@ -793,13 +793,13 @@
|
||||
TARGETS =
|
||||
|
||||
ifneq ($(BUILD_SERVER),0)
|
||||
- TARGETS += $(B)/ioq3ded.$(ARCH)$(BINEXT)
|
||||
+ TARGETS += $(B)/Reactionded.$(ARCH)$(BINEXT)
|
||||
endif
|
||||
|
||||
ifneq ($(BUILD_CLIENT),0)
|
||||
- TARGETS += $(B)/ioquake3.$(ARCH)$(BINEXT)
|
||||
+ TARGETS += $(B)/Reaction.$(ARCH)$(BINEXT)
|
||||
ifneq ($(BUILD_CLIENT_SMP),0)
|
||||
- TARGETS += $(B)/ioquake3-smp.$(ARCH)$(BINEXT)
|
||||
+ TARGETS += $(B)/Reaction-smp.$(ARCH)$(BINEXT)
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -974,7 +974,7 @@
|
||||
# an informational message, then start building
|
||||
targets: makedirs
|
||||
@echo ""
|
||||
- @echo "Building ioquake3 in $(B):"
|
||||
+ @echo "Building Reaction in $(B):"
|
||||
@echo " PLATFORM: $(PLATFORM)"
|
||||
@echo " ARCH: $(ARCH)"
|
||||
@echo " VERSION: $(VERSION)"
|
||||
@@ -1486,13 +1486,13 @@
|
||||
Q3POBJ_SMP += \
|
||||
$(B)/clientsmp/sdl_glimp.o
|
||||
|
||||
-$(B)/ioquake3.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
|
||||
+$(B)/Reaction.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
|
||||
-o $@ $(Q3OBJ) $(Q3POBJ) \
|
||||
$(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
|
||||
|
||||
-$(B)/ioquake3-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
|
||||
+$(B)/Reaction-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
|
||||
-o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
|
||||
@@ -1626,7 +1626,7 @@
|
||||
$(B)/ded/con_tty.o
|
||||
endif
|
||||
|
||||
-$(B)/ioq3ded.$(ARCH)$(BINEXT): $(Q3DOBJ)
|
||||
+$(B)/Reactionded.$(ARCH)$(BINEXT): $(Q3DOBJ)
|
||||
$(echo_cmd) "LD $@"
|
||||
$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
|
||||
|
||||
@@ -2081,17 +2081,17 @@
|
||||
-$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack
|
||||
|
||||
ifneq ($(BUILD_CLIENT),0)
|
||||
- $(INSTALL) -s -m 0755 $(BR)/ioquake3.$(ARCH)$(BINEXT) $(COPYDIR)/ioquake3.$(ARCH)$(BINEXT)
|
||||
+ $(INSTALL) -s -m 0755 $(BR)/Reaction.$(ARCH)$(BINEXT) $(COPYDIR)/Reaction.$(ARCH)$(BINEXT)
|
||||
endif
|
||||
|
||||
# Don't copy the SMP until it's working together with SDL.
|
||||
#ifneq ($(BUILD_CLIENT_SMP),0)
|
||||
-# $(INSTALL) -s -m 0755 $(BR)/ioquake3-smp.$(ARCH)$(BINEXT) $(COPYDIR)/ioquake3-smp.$(ARCH)$(BINEXT)
|
||||
+# $(INSTALL) -s -m 0755 $(BR)/Reaction-smp.$(ARCH)$(BINEXT) $(COPYDIR)/Reaction-smp.$(ARCH)$(BINEXT)
|
||||
#endif
|
||||
|
||||
ifneq ($(BUILD_SERVER),0)
|
||||
- @if [ -f $(BR)/ioq3ded.$(ARCH)$(BINEXT) ]; then \
|
||||
- $(INSTALL) -s -m 0755 $(BR)/ioq3ded.$(ARCH)$(BINEXT) $(COPYDIR)/ioq3ded.$(ARCH)$(BINEXT); \
|
||||
+ @if [ -f $(BR)/Reactionded.$(ARCH)$(BINEXT) ]; then \
|
||||
+ $(INSTALL) -s -m 0755 $(BR)/Reactionded.$(ARCH)$(BINEXT) $(COPYDIR)/Reactionded.$(ARCH)$(BINEXT); \
|
||||
fi
|
||||
endif
|
||||
|
||||
@@ -2157,10 +2157,10 @@
|
||||
endif
|
||||
|
||||
dist:
|
||||
- rm -rf ioquake3-$(VERSION)
|
||||
- svn export . ioquake3-$(VERSION)
|
||||
- tar --owner=root --group=root --force-local -cjf ioquake3-$(VERSION).tar.bz2 ioquake3-$(VERSION)
|
||||
- rm -rf ioquake3-$(VERSION)
|
||||
+ rm -rf Reaction-$(VERSION)
|
||||
+ svn export . Reaction-$(VERSION)
|
||||
+ tar --owner=root --group=root --force-local -cjf Reaction-$(VERSION).tar.bz2 Reaction-$(VERSION)
|
||||
+ rm -rf Reaction-$(VERSION)
|
||||
|
||||
#############################################################################
|
||||
# DEPENDENCIES
|
||||
Loading…
Reference in a new issue