* Moved everything in game/ to src/ so that hopefully quake2

will run out of the source tree. * Added the LICENSE files from xatrix and rogue, someone can look at them and decide if we can put the rest of them into CVS. * Moved 2do.txt from ctf into docs/TODO-ctf.txt
2024-11-10 07:12:01 +00:00 · 2002-04-06 06:30:19 +00:00 · 2002-04-06 06:30:19 +00:00 · 4bd5535532
commit 4bd5535532
parent 2e21941abd
127 changed files with 718 additions and 23 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,3 +1,3 @@
 # $Id$

-SUBDIRS = src game
+SUBDIRS = src
--- a/configure.in
+++ b/configure.in
@ -72,11 +72,8 @@ AC_CHECK_FUNCS([bzero floor getcwd gethostbyname getmntent getpagesize gettimeof

 AC_CONFIG_FILES([Makefile
 				 src/Makefile
-				 game/Makefile
-				 game/baseq2/Makefile
-				 game/ctf/Makefile
-				 game/xatrix/Makefile
-				 game/rogue/Makefile])
-#				 ref_gl/Makefile
-#				 ref_soft/Makefile])
+				 src/baseq2/Makefile
+				 src/ctf/Makefile
+				 src/xatrix/Makefile
+				 src/rogue/Makefile])
 AC_OUTPUT
--- a/docs/TODO-ctf.txt
+++ b/docs/TODO-ctf.txt
--- a/game/Makefile.am
+++ b/game/Makefile.am
@ -1,4 +0,0 @@
-# $Id$
-
-#SUBDIRS = baseq2 ctf
-SUBDIRS = baseq2 ctf xatrix rogue
--- a/game/xatrix/.gitignore
+++ b/game/xatrix/.gitignore
@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,8 +1,8 @@
 # $Id$

-# Process this file with automake to create Makefile.in
-
-SUBDIRS = .
+# swap comments to build the modpacks
+#SUBDIRS = . baseq2 ctf
+SUBDIRS = . baseq2 ctf xatrix rogue

 bin_PROGRAMS = quake2 ref_glx.so ref_softx.so

@ -95,7 +95,6 @@ ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c
 #ref_softsdl_so_SOURCES = $(REF_SOFT_COMMON) rw_sdl.c

 AM_CFLAGS = -Wall -Werror -pipe
-AM_CPPFLAGS = -I../game

 quake2_LDFLAGS = -lm -ldl -lpthread

--- a/game/baseq2/.gitignore
+++ b/game/baseq2/.gitignore
--- a/game/baseq2/Makefile.am
+++ b/game/baseq2/Makefile.am
@ -53,5 +53,5 @@ game_so_SOURCES = g_ai.c \
 			m_flash.c

 AM_CFLAGS = -fPIC -Wall -Werror -pipe
-AM_CPPFLAGS = -I../../src -I..
+AM_CPPFLAGS = -I..
 LDFLAGS = -shared
--- a/game/baseq2/g_ai.c
+++ b/game/baseq2/g_ai.c
--- a/game/baseq2/g_chase.c
+++ b/game/baseq2/g_chase.c
--- a/game/baseq2/g_cmds.c
+++ b/game/baseq2/g_cmds.c
--- a/game/baseq2/g_combat.c
+++ b/game/baseq2/g_combat.c
--- a/game/baseq2/g_func.c
+++ b/game/baseq2/g_func.c
--- a/game/baseq2/g_items.c
+++ b/game/baseq2/g_items.c
--- a/game/baseq2/g_local.h
+++ b/game/baseq2/g_local.h
--- a/game/baseq2/g_main.c
+++ b/game/baseq2/g_main.c
--- a/game/baseq2/g_misc.c
+++ b/game/baseq2/g_misc.c
--- a/game/baseq2/g_monster.c
+++ b/game/baseq2/g_monster.c
--- a/game/baseq2/g_phys.c
+++ b/game/baseq2/g_phys.c
--- a/game/baseq2/g_save.c
+++ b/game/baseq2/g_save.c
--- a/game/baseq2/g_spawn.c
+++ b/game/baseq2/g_spawn.c
--- a/game/baseq2/g_svcmds.c
+++ b/game/baseq2/g_svcmds.c
--- a/game/baseq2/g_target.c
+++ b/game/baseq2/g_target.c
--- a/game/baseq2/g_trigger.c
+++ b/game/baseq2/g_trigger.c
--- a/game/baseq2/g_turret.c
+++ b/game/baseq2/g_turret.c
--- a/game/baseq2/g_utils.c
+++ b/game/baseq2/g_utils.c
--- a/game/baseq2/g_weapon.c
+++ b/game/baseq2/g_weapon.c
--- a/game/baseq2/game.def
+++ b/game/baseq2/game.def
--- a/game/baseq2/game.dsp
+++ b/game/baseq2/game.dsp
--- a/game/baseq2/m_actor.c
+++ b/game/baseq2/m_actor.c
--- a/game/baseq2/m_actor.h
+++ b/game/baseq2/m_actor.h
--- a/game/baseq2/m_berserk.c
+++ b/game/baseq2/m_berserk.c
--- a/game/baseq2/m_berserk.h
+++ b/game/baseq2/m_berserk.h
--- a/game/baseq2/m_boss2.c
+++ b/game/baseq2/m_boss2.c
--- a/game/baseq2/m_boss2.h
+++ b/game/baseq2/m_boss2.h
--- a/game/baseq2/m_boss3.c
+++ b/game/baseq2/m_boss3.c
--- a/game/baseq2/m_boss31.c
+++ b/game/baseq2/m_boss31.c
--- a/game/baseq2/m_boss31.h
+++ b/game/baseq2/m_boss31.h
--- a/game/baseq2/m_boss32.c
+++ b/game/baseq2/m_boss32.c
--- a/game/baseq2/m_boss32.h
+++ b/game/baseq2/m_boss32.h
--- a/game/baseq2/m_brain.c
+++ b/game/baseq2/m_brain.c
--- a/game/baseq2/m_brain.h
+++ b/game/baseq2/m_brain.h
--- a/game/baseq2/m_chick.c
+++ b/game/baseq2/m_chick.c
--- a/game/baseq2/m_chick.h
+++ b/game/baseq2/m_chick.h
--- a/game/baseq2/m_flash.c
+++ b/game/baseq2/m_flash.c
--- a/game/baseq2/m_flipper.c
+++ b/game/baseq2/m_flipper.c
--- a/game/baseq2/m_flipper.h
+++ b/game/baseq2/m_flipper.h
--- a/game/baseq2/m_float.c
+++ b/game/baseq2/m_float.c
--- a/game/baseq2/m_float.h
+++ b/game/baseq2/m_float.h
--- a/game/baseq2/m_flyer.c
+++ b/game/baseq2/m_flyer.c
--- a/game/baseq2/m_flyer.h
+++ b/game/baseq2/m_flyer.h
--- a/game/baseq2/m_gladiator.c
+++ b/game/baseq2/m_gladiator.c
--- a/game/baseq2/m_gladiator.h
+++ b/game/baseq2/m_gladiator.h
--- a/game/baseq2/m_gunner.c
+++ b/game/baseq2/m_gunner.c
--- a/game/baseq2/m_gunner.h
+++ b/game/baseq2/m_gunner.h
--- a/game/baseq2/m_hover.c
+++ b/game/baseq2/m_hover.c
--- a/game/baseq2/m_hover.h
+++ b/game/baseq2/m_hover.h
--- a/game/baseq2/m_infantry.c
+++ b/game/baseq2/m_infantry.c
--- a/game/baseq2/m_infantry.h
+++ b/game/baseq2/m_infantry.h
--- a/game/baseq2/m_insane.c
+++ b/game/baseq2/m_insane.c
--- a/game/baseq2/m_insane.h
+++ b/game/baseq2/m_insane.h
--- a/game/baseq2/m_medic.c
+++ b/game/baseq2/m_medic.c
--- a/game/baseq2/m_medic.h
+++ b/game/baseq2/m_medic.h
--- a/game/baseq2/m_move.c
+++ b/game/baseq2/m_move.c
--- a/game/baseq2/m_mutant.c
+++ b/game/baseq2/m_mutant.c
--- a/game/baseq2/m_mutant.h
+++ b/game/baseq2/m_mutant.h
--- a/game/baseq2/m_parasite.c
+++ b/game/baseq2/m_parasite.c
--- a/game/baseq2/m_parasite.h
+++ b/game/baseq2/m_parasite.h
--- a/game/baseq2/m_player.h
+++ b/game/baseq2/m_player.h
--- a/game/baseq2/m_rider.h
+++ b/game/baseq2/m_rider.h
--- a/game/baseq2/m_soldier.c
+++ b/game/baseq2/m_soldier.c
--- a/game/baseq2/m_soldier.h
+++ b/game/baseq2/m_soldier.h
--- a/game/baseq2/m_supertank.c
+++ b/game/baseq2/m_supertank.c
--- a/game/baseq2/m_supertank.h
+++ b/game/baseq2/m_supertank.h
--- a/game/baseq2/m_tank.c
+++ b/game/baseq2/m_tank.c
--- a/game/baseq2/m_tank.h
+++ b/game/baseq2/m_tank.h
--- a/game/baseq2/p_client.c
+++ b/game/baseq2/p_client.c
--- a/game/baseq2/p_hud.c
+++ b/game/baseq2/p_hud.c
--- a/game/baseq2/p_trail.c
+++ b/game/baseq2/p_trail.c
--- a/game/baseq2/p_view.c
+++ b/game/baseq2/p_view.c
--- a/game/baseq2/p_weapon.c
+++ b/game/baseq2/p_weapon.c
--- a/game/baseq2/q_shared.c
+++ b/game/baseq2/q_shared.c
--- a/game/baseq2/q_shared.h
+++ b/game/baseq2/q_shared.h
--- a/game/ctf/.gitignore
+++ b/game/ctf/.gitignore
--- a/game/ctf/Makefile.am
+++ b/game/ctf/Makefile.am
@ -30,5 +30,5 @@ game_so_SOURCES = \
 			q_shared.c

 AM_CFLAGS = -fPIC -Wall -Werror -pipe
-AM_CPPFLAGS = -I../../src -I..
+AM_CPPFLAGS = -I..
 LDFLAGS = -shared
--- a/game/ctf/ctf.def
+++ b/game/ctf/ctf.def
--- a/game/ctf/ctf.dsp
+++ b/game/ctf/ctf.dsp
--- a/game/ctf/g_ai.c
+++ b/game/ctf/g_ai.c
--- a/game/ctf/g_chase.c
+++ b/game/ctf/g_chase.c
--- a/game/ctf/g_cmds.c
+++ b/game/ctf/g_cmds.c
--- a/game/ctf/g_combat.c
+++ b/game/ctf/g_combat.c
--- a/game/ctf/g_ctf.c
+++ b/game/ctf/g_ctf.c
--- a/game/ctf/g_ctf.h
+++ b/game/ctf/g_ctf.h
--- a/game/ctf/g_func.c
+++ b/game/ctf/g_func.c
--- a/game/ctf/g_items.c
+++ b/game/ctf/g_items.c
--- a/game/ctf/g_local.h
+++ b/game/ctf/g_local.h
--- a/game/ctf/g_main.c
+++ b/game/ctf/g_main.c
--- a/game/ctf/g_misc.c
+++ b/game/ctf/g_misc.c
--- a/game/ctf/g_monster.c
+++ b/game/ctf/g_monster.c
--- a/game/ctf/g_phys.c
+++ b/game/ctf/g_phys.c
--- a/Show more
+++ b/Show more