commit c137d2ad74b9b46c93411ce7fcae6d7041777d07
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Sep 6 18:32:11 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Sep 6 18:32:11 2008 +0000
Move doom-specific files to a separate directory.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1201
---
configure.in | 1 +
src/Makefile.am | 68 +++++++----------------------------------------
src/{ => doom}/am_map.c | 0
src/{ => doom}/am_map.h | 0
src/{ => doom}/d_englsh.h | 0
src/{ => doom}/d_items.c | 0
src/{ => doom}/d_items.h | 0
src/{ => doom}/d_iwad.c | 0
src/{ => doom}/d_iwad.h | 0
src/{ => doom}/d_main.c | 0
src/{ => doom}/d_main.h | 0
src/{ => doom}/d_net.c | 0
src/{ => doom}/d_net.h | 0
src/{ => doom}/d_player.h | 0
src/{ => doom}/d_textur.h | 0
src/{ => doom}/d_think.h | 0
src/{ => doom}/doomdata.h | 0
src/{ => doom}/doomdef.c | 0
src/{ => doom}/doomdef.h | 0
src/{ => doom}/doomstat.c | 0
src/{ => doom}/doomstat.h | 0
src/{ => doom}/dstrings.c | 0
src/{ => doom}/dstrings.h | 0
src/{ => doom}/f_finale.c | 0
src/{ => doom}/f_finale.h | 0
src/{ => doom}/g_game.c | 0
src/{ => doom}/g_game.h | 0
src/{ => doom}/hu_lib.c | 0
src/{ => doom}/hu_lib.h | 0
src/{ => doom}/hu_stuff.c | 0
src/{ => doom}/hu_stuff.h | 0
src/{ => doom}/info.c | 0
src/{ => doom}/info.h | 0
src/{ => doom}/m_menu.c | 0
src/{ => doom}/m_menu.h | 0
src/{ => doom}/p_ceilng.c | 0
src/{ => doom}/p_doors.c | 0
src/{ => doom}/p_enemy.c | 0
src/{ => doom}/p_floor.c | 0
src/{ => doom}/p_inter.c | 0
src/{ => doom}/p_inter.h | 0
src/{ => doom}/p_lights.c | 0
src/{ => doom}/p_local.h | 0
src/{ => doom}/p_map.c | 0
src/{ => doom}/p_maputl.c | 0
src/{ => doom}/p_mobj.c | 0
src/{ => doom}/p_mobj.h | 0
src/{ => doom}/p_plats.c | 0
src/{ => doom}/p_pspr.c | 0
src/{ => doom}/p_pspr.h | 0
src/{ => doom}/p_saveg.c | 0
src/{ => doom}/p_saveg.h | 0
src/{ => doom}/p_setup.c | 0
src/{ => doom}/p_setup.h | 0
src/{ => doom}/p_sight.c | 0
src/{ => doom}/p_spec.c | 0
src/{ => doom}/p_spec.h | 0
src/{ => doom}/p_switch.c | 0
src/{ => doom}/p_telept.c | 0
src/{ => doom}/p_tick.c | 0
src/{ => doom}/p_tick.h | 0
src/{ => doom}/p_user.c | 0
src/{ => doom}/r_bsp.c | 0
src/{ => doom}/r_bsp.h | 0
src/{ => doom}/r_data.c | 0
src/{ => doom}/r_data.h | 0
src/{ => doom}/r_defs.h | 0
src/{ => doom}/r_draw.c | 0
src/{ => doom}/r_draw.h | 0
src/{ => doom}/r_local.h | 0
src/{ => doom}/r_main.c | 0
src/{ => doom}/r_main.h | 0
src/{ => doom}/r_plane.c | 0
src/{ => doom}/r_plane.h | 0
src/{ => doom}/r_segs.c | 0
src/{ => doom}/r_segs.h | 0
src/{ => doom}/r_sky.c | 0
src/{ => doom}/r_sky.h | 0
src/{ => doom}/r_state.h | 0
src/{ => doom}/r_things.c | 0
src/{ => doom}/r_things.h | 0
src/{ => doom}/sounds.c | 0
src/{ => doom}/sounds.h | 0
src/{ => doom}/st_lib.c | 0
src/{ => doom}/st_lib.h | 0
src/{ => doom}/st_stuff.c | 0
src/{ => doom}/st_stuff.h | 0
src/{ => doom}/wi_stuff.c | 0
src/{ => doom}/wi_stuff.h | 0
89 files changed, 11 insertions(+), 58 deletions(-)
diff --git a/configure.in b/configure.in
index e6e12be4..5c008ba1 100644
--- a/configure.in
+++ b/configure.in
@@ -79,6 +79,7 @@ textscreen/examples/Makefile
setup/Makefile
man/Makefile
src/Makefile
+src/doom/Makefile
src/heretic/Makefile
src/hexen/Makefile
pcsound/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a85b92a..90e5dedb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS=heretic hexen
+SUBDIRS=doom heretic hexen
gamesdir = $(prefix)/games
games_PROGRAMS = chocolate-doom chocolate-server
-AM_CFLAGS = -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+AM_CFLAGS = -Idoom -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
DEDSERV_FILES=\
d_dedicated.c \
@@ -26,31 +26,13 @@ chocolate_server_SOURCES=$(DEDSERV_FILES)
chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@
MAIN_SOURCE_FILES=\
-am_map.c am_map.h \
-d_englsh.h \
-d_event.h \
-d_items.c d_items.h \
-d_iwad.c d_iwad.h \
-d_main.c d_main.h \
-d_net.c d_net.h \
-doomdata.h \
-doomdef.c doomdef.h \
+ d_event.h \
doomkeys.h \
doomfeatures.h \
-doomstat.c doomstat.h \
doomtype.h \
-d_player.h \
-dstrings.c dstrings.h \
-d_textur.h \
-d_think.h \
d_ticcmd.h \
-f_finale.c f_finale.h \
f_wipe.c f_wipe.h \
-g_game.c g_game.h \
-hu_lib.c hu_lib.h \
-hu_stuff.c hu_stuff.h \
i_main.c \
-info.c info.h \
i_joystick.c i_joystick.h \
i_scale.c i_scale.h \
i_swap.h \
@@ -62,49 +44,13 @@ m_bbox.c m_bbox.h \
m_cheat.c m_cheat.h \
m_config.c m_config.h \
m_fixed.c m_fixed.h \
-m_menu.c m_menu.h \
m_misc.c m_misc.h \
md5.c md5.h \
memio.c memio.h \
m_random.c m_random.h \
-p_ceilng.c \
-p_doors.c \
-p_enemy.c \
-p_floor.c \
-p_inter.c p_inter.h \
-p_lights.c \
-p_local.h \
-p_map.c \
-p_maputl.c \
-p_mobj.c p_mobj.h \
-p_plats.c \
-p_pspr.c p_pspr.h \
-p_saveg.c p_saveg.h \
-p_setup.c p_setup.h \
-p_sight.c \
-p_spec.c p_spec.h \
-p_switch.c \
-p_telept.c \
-p_tick.c p_tick.h \
-p_user.c \
-r_bsp.c r_bsp.h \
-r_data.c r_data.h \
-r_defs.h \
-r_draw.c r_draw.h \
-r_local.h \
-r_main.c r_main.h \
-r_plane.c r_plane.h \
-r_segs.c r_segs.h \
-r_sky.c r_sky.h \
-r_state.h \
-r_things.c r_things.h \
-sounds.c sounds.h \
s_sound.c s_sound.h \
-st_lib.c st_lib.h \
-st_stuff.c st_stuff.h \
tables.c tables.h \
v_video.c v_video.h \
-wi_stuff.c wi_stuff.h \
w_checksum.c w_checksum.h \
w_wad.c w_wad.h \
w_file.c w_file.h \
@@ -171,7 +117,13 @@ else
chocolate_doom_SOURCES=$(SOURCE_FILES)
endif
-chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
+chocolate_doom_LDADD = doom/libdoom.a \
+ ../textscreen/libtextscreen.a \
+ ../pcsound/libpcsound.a \
+ @LDFLAGS@ \
+ @SDL_LIBS@ \
+ @SDLMIXER_LIBS@ \
+ @SDLNET_LIBS@
EXTRA_DIST = \
icon.c \
diff --git a/src/am_map.c b/src/doom/am_map.c
similarity index 100%
rename from src/am_map.c
rename to src/doom/am_map.c
diff --git a/src/am_map.h b/src/doom/am_map.h
similarity index 100%
rename from src/am_map.h
rename to src/doom/am_map.h
diff --git a/src/d_englsh.h b/src/doom/d_englsh.h
similarity index 100%
rename from src/d_englsh.h
rename to src/doom/d_englsh.h
diff --git a/src/d_items.c b/src/doom/d_items.c
similarity index 100%
rename from src/d_items.c
rename to src/doom/d_items.c
diff --git a/src/d_items.h b/src/doom/d_items.h
similarity index 100%
rename from src/d_items.h
rename to src/doom/d_items.h
diff --git a/src/d_iwad.c b/src/doom/d_iwad.c
similarity index 100%
rename from src/d_iwad.c
rename to src/doom/d_iwad.c
diff --git a/src/d_iwad.h b/src/doom/d_iwad.h
similarity index 100%
rename from src/d_iwad.h
rename to src/doom/d_iwad.h
diff --git a/src/d_main.c b/src/doom/d_main.c
similarity index 100%
rename from src/d_main.c
rename to src/doom/d_main.c
diff --git a/src/d_main.h b/src/doom/d_main.h
similarity index 100%
rename from src/d_main.h
rename to src/doom/d_main.h
diff --git a/src/d_net.c b/src/doom/d_net.c
similarity index 100%
rename from src/d_net.c
rename to src/doom/d_net.c
diff --git a/src/d_net.h b/src/doom/d_net.h
similarity index 100%
rename from src/d_net.h
rename to src/doom/d_net.h
diff --git a/src/d_player.h b/src/doom/d_player.h
similarity index 100%
rename from src/d_player.h
rename to src/doom/d_player.h
diff --git a/src/d_textur.h b/src/doom/d_textur.h
similarity index 100%
rename from src/d_textur.h
rename to src/doom/d_textur.h
diff --git a/src/d_think.h b/src/doom/d_think.h
similarity index 100%
rename from src/d_think.h
rename to src/doom/d_think.h
diff --git a/src/doomdata.h b/src/doom/doomdata.h
similarity index 100%
rename from src/doomdata.h
rename to src/doom/doomdata.h
diff --git a/src/doomdef.c b/src/doom/doomdef.c
similarity index 100%
rename from src/doomdef.c
rename to src/doom/doomdef.c
diff --git a/src/doomdef.h b/src/doom/doomdef.h
similarity index 100%
rename from src/doomdef.h
rename to src/doom/doomdef.h
diff --git a/src/doomstat.c b/src/doom/doomstat.c
similarity index 100%
rename from src/doomstat.c
rename to src/doom/doomstat.c
diff --git a/src/doomstat.h b/src/doom/doomstat.h
similarity index 100%
rename from src/doomstat.h
rename to src/doom/doomstat.h
diff --git a/src/dstrings.c b/src/doom/dstrings.c
similarity index 100%
rename from src/dstrings.c
rename to src/doom/dstrings.c
diff --git a/src/dstrings.h b/src/doom/dstrings.h
similarity index 100%
rename from src/dstrings.h
rename to src/doom/dstrings.h
diff --git a/src/f_finale.c b/src/doom/f_finale.c
similarity index 100%
rename from src/f_finale.c
rename to src/doom/f_finale.c
diff --git a/src/f_finale.h b/src/doom/f_finale.h
similarity index 100%
rename from src/f_finale.h
rename to src/doom/f_finale.h
diff --git a/src/g_game.c b/src/doom/g_game.c
similarity index 100%
rename from src/g_game.c
rename to src/doom/g_game.c
diff --git a/src/g_game.h b/src/doom/g_game.h
similarity index 100%
rename from src/g_game.h
rename to src/doom/g_game.h
diff --git a/src/hu_lib.c b/src/doom/hu_lib.c
similarity index 100%
rename from src/hu_lib.c
rename to src/doom/hu_lib.c
diff --git a/src/hu_lib.h b/src/doom/hu_lib.h
similarity index 100%
rename from src/hu_lib.h
rename to src/doom/hu_lib.h
diff --git a/src/hu_stuff.c b/src/doom/hu_stuff.c
similarity index 100%
rename from src/hu_stuff.c
rename to src/doom/hu_stuff.c
diff --git a/src/hu_stuff.h b/src/doom/hu_stuff.h
similarity index 100%
rename from src/hu_stuff.h
rename to src/doom/hu_stuff.h
diff --git a/src/info.c b/src/doom/info.c
similarity index 100%
rename from src/info.c
rename to src/doom/info.c
diff --git a/src/info.h b/src/doom/info.h
similarity index 100%
rename from src/info.h
rename to src/doom/info.h
diff --git a/src/m_menu.c b/src/doom/m_menu.c
similarity index 100%
rename from src/m_menu.c
rename to src/doom/m_menu.c
diff --git a/src/m_menu.h b/src/doom/m_menu.h
similarity index 100%
rename from src/m_menu.h
rename to src/doom/m_menu.h
diff --git a/src/p_ceilng.c b/src/doom/p_ceilng.c
similarity index 100%
rename from src/p_ceilng.c
rename to src/doom/p_ceilng.c
diff --git a/src/p_doors.c b/src/doom/p_doors.c
similarity index 100%
rename from src/p_doors.c
rename to src/doom/p_doors.c
diff --git a/src/p_enemy.c b/src/doom/p_enemy.c
similarity index 100%
rename from src/p_enemy.c
rename to src/doom/p_enemy.c
diff --git a/src/p_floor.c b/src/doom/p_floor.c
similarity index 100%
rename from src/p_floor.c
rename to src/doom/p_floor.c
diff --git a/src/p_inter.c b/src/doom/p_inter.c
similarity index 100%
rename from src/p_inter.c
rename to src/doom/p_inter.c
diff --git a/src/p_inter.h b/src/doom/p_inter.h
similarity index 100%
rename from src/p_inter.h
rename to src/doom/p_inter.h
diff --git a/src/p_lights.c b/src/doom/p_lights.c
similarity index 100%
rename from src/p_lights.c
rename to src/doom/p_lights.c
diff --git a/src/p_local.h b/src/doom/p_local.h
similarity index 100%
rename from src/p_local.h
rename to src/doom/p_local.h
diff --git a/src/p_map.c b/src/doom/p_map.c
similarity index 100%
rename from src/p_map.c
rename to src/doom/p_map.c
diff --git a/src/p_maputl.c b/src/doom/p_maputl.c
similarity index 100%
rename from src/p_maputl.c
rename to src/doom/p_maputl.c
diff --git a/src/p_mobj.c b/src/doom/p_mobj.c
similarity index 100%
rename from src/p_mobj.c
rename to src/doom/p_mobj.c
diff --git a/src/p_mobj.h b/src/doom/p_mobj.h
similarity index 100%
rename from src/p_mobj.h
rename to src/doom/p_mobj.h
diff --git a/src/p_plats.c b/src/doom/p_plats.c
similarity index 100%
rename from src/p_plats.c
rename to src/doom/p_plats.c
diff --git a/src/p_pspr.c b/src/doom/p_pspr.c
similarity index 100%
rename from src/p_pspr.c
rename to src/doom/p_pspr.c
diff --git a/src/p_pspr.h b/src/doom/p_pspr.h
similarity index 100%
rename from src/p_pspr.h
rename to src/doom/p_pspr.h
diff --git a/src/p_saveg.c b/src/doom/p_saveg.c
similarity index 100%
rename from src/p_saveg.c
rename to src/doom/p_saveg.c
diff --git a/src/p_saveg.h b/src/doom/p_saveg.h
similarity index 100%
rename from src/p_saveg.h
rename to src/doom/p_saveg.h
diff --git a/src/p_setup.c b/src/doom/p_setup.c
similarity index 100%
rename from src/p_setup.c
rename to src/doom/p_setup.c
diff --git a/src/p_setup.h b/src/doom/p_setup.h
similarity index 100%
rename from src/p_setup.h
rename to src/doom/p_setup.h
diff --git a/src/p_sight.c b/src/doom/p_sight.c
similarity index 100%
rename from src/p_sight.c
rename to src/doom/p_sight.c
diff --git a/src/p_spec.c b/src/doom/p_spec.c
similarity index 100%
rename from src/p_spec.c
rename to src/doom/p_spec.c
diff --git a/src/p_spec.h b/src/doom/p_spec.h
similarity index 100%
rename from src/p_spec.h
rename to src/doom/p_spec.h
diff --git a/src/p_switch.c b/src/doom/p_switch.c
similarity index 100%
rename from src/p_switch.c
rename to src/doom/p_switch.c
diff --git a/src/p_telept.c b/src/doom/p_telept.c
similarity index 100%
rename from src/p_telept.c
rename to src/doom/p_telept.c
diff --git a/src/p_tick.c b/src/doom/p_tick.c
similarity index 100%
rename from src/p_tick.c
rename to src/doom/p_tick.c
diff --git a/src/p_tick.h b/src/doom/p_tick.h
similarity index 100%
rename from src/p_tick.h
rename to src/doom/p_tick.h
diff --git a/src/p_user.c b/src/doom/p_user.c
similarity index 100%
rename from src/p_user.c
rename to src/doom/p_user.c
diff --git a/src/r_bsp.c b/src/doom/r_bsp.c
similarity index 100%
rename from src/r_bsp.c
rename to src/doom/r_bsp.c
diff --git a/src/r_bsp.h b/src/doom/r_bsp.h
similarity index 100%
rename from src/r_bsp.h
rename to src/doom/r_bsp.h
diff --git a/src/r_data.c b/src/doom/r_data.c
similarity index 100%
rename from src/r_data.c
rename to src/doom/r_data.c
diff --git a/src/r_data.h b/src/doom/r_data.h
similarity index 100%
rename from src/r_data.h
rename to src/doom/r_data.h
diff --git a/src/r_defs.h b/src/doom/r_defs.h
similarity index 100%
rename from src/r_defs.h
rename to src/doom/r_defs.h
diff --git a/src/r_draw.c b/src/doom/r_draw.c
similarity index 100%
rename from src/r_draw.c
rename to src/doom/r_draw.c
diff --git a/src/r_draw.h b/src/doom/r_draw.h
similarity index 100%
rename from src/r_draw.h
rename to src/doom/r_draw.h
diff --git a/src/r_local.h b/src/doom/r_local.h
similarity index 100%
rename from src/r_local.h
rename to src/doom/r_local.h
diff --git a/src/r_main.c b/src/doom/r_main.c
similarity index 100%
rename from src/r_main.c
rename to src/doom/r_main.c
diff --git a/src/r_main.h b/src/doom/r_main.h
similarity index 100%
rename from src/r_main.h
rename to src/doom/r_main.h
diff --git a/src/r_plane.c b/src/doom/r_plane.c
similarity index 100%
rename from src/r_plane.c
rename to src/doom/r_plane.c
diff --git a/src/r_plane.h b/src/doom/r_plane.h
similarity index 100%
rename from src/r_plane.h
rename to src/doom/r_plane.h
diff --git a/src/r_segs.c b/src/doom/r_segs.c
similarity index 100%
rename from src/r_segs.c
rename to src/doom/r_segs.c
diff --git a/src/r_segs.h b/src/doom/r_segs.h
similarity index 100%
rename from src/r_segs.h
rename to src/doom/r_segs.h
diff --git a/src/r_sky.c b/src/doom/r_sky.c
similarity index 100%
rename from src/r_sky.c
rename to src/doom/r_sky.c
diff --git a/src/r_sky.h b/src/doom/r_sky.h
similarity index 100%
rename from src/r_sky.h
rename to src/doom/r_sky.h
diff --git a/src/r_state.h b/src/doom/r_state.h
similarity index 100%
rename from src/r_state.h
rename to src/doom/r_state.h
diff --git a/src/r_things.c b/src/doom/r_things.c
similarity index 100%
rename from src/r_things.c
rename to src/doom/r_things.c
diff --git a/src/r_things.h b/src/doom/r_things.h
similarity index 100%
rename from src/r_things.h
rename to src/doom/r_things.h
diff --git a/src/sounds.c b/src/doom/sounds.c
similarity index 100%
rename from src/sounds.c
rename to src/doom/sounds.c
diff --git a/src/sounds.h b/src/doom/sounds.h
similarity index 100%
rename from src/sounds.h
rename to src/doom/sounds.h
diff --git a/src/st_lib.c b/src/doom/st_lib.c
similarity index 100%
rename from src/st_lib.c
rename to src/doom/st_lib.c
diff --git a/src/st_lib.h b/src/doom/st_lib.h
similarity index 100%
rename from src/st_lib.h
rename to src/doom/st_lib.h
diff --git a/src/st_stuff.c b/src/doom/st_stuff.c
similarity index 100%
rename from src/st_stuff.c
rename to src/doom/st_stuff.c
diff --git a/src/st_stuff.h b/src/doom/st_stuff.h
similarity index 100%
rename from src/st_stuff.h
rename to src/doom/st_stuff.h
diff --git a/src/wi_stuff.c b/src/doom/wi_stuff.c
similarity index 100%
rename from src/wi_stuff.c
rename to src/doom/wi_stuff.c
diff --git a/src/wi_stuff.h b/src/doom/wi_stuff.h
similarity index 100%
rename from src/wi_stuff.h
rename to src/doom/wi_stuff.h