Add initial client/server connect code. Reorganise sources list in

Makefile.am.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 232

1 files changed, 98 insertions, 27 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8939131b..b7db5881 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,33 +7,104 @@ AM_CFLAGS = -I../textscreen @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -Wall
 chocolate_doom_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ 
 
 SOURCE_FILES=\
-am_map.c    d_think.h   i_video.c   p_floor.c   p_tick.c    r_things.h	\
-am_map.h    d_ticcmd.h  i_video.h   p_inter.c   p_tick.h    sounds.c	\
-d_englsh.h  f_finale.c  m_argv.c    p_inter.h   p_user.c    sounds.h	\
-d_event.h   f_finale.h  m_argv.h    p_lights.c  r_bsp.c     s_sound.c	\
-d_french.h  f_wipe.c    m_bbox.c    p_local.h   r_bsp.h     s_sound.h	\
-d_items.c   f_wipe.h    m_bbox.h    p_map.c     r_data.c    st_lib.c	\
-d_items.h   g_game.c    m_cheat.c   p_maputl.c  r_data.h    st_lib.h	\
-d_main.c    g_game.h    m_cheat.h   p_mobj.c    r_defs.h    st_stuff.c	\
-d_main.h    hu_lib.c    m_fixed.c   p_mobj.h    r_draw.c    st_stuff.h	\
-d_net.c     hu_lib.h    m_fixed.h   p_plats.c   r_draw.h    tables.c	\
-d_net.h     hu_stuff.c  m_menu.c    p_pspr.c    r_local.h   tables.h	\
-doomdata.h  hu_stuff.h  m_menu.h    p_pspr.h    r_main.c    v_video.c	\
-doomdef.c   i_main.c    m_misc.c    p_saveg.c   r_main.h    v_video.h	\
-doomdef.h   i_net.c     m_misc.h    p_saveg.h   r_plane.c   wi_stuff.c	\
-doomstat.c  i_net.h     m_random.c  p_setup.c   r_plane.h   wi_stuff.h	\
-doomstat.h  info.c      m_random.h  p_setup.h   r_segs.c    w_wad.c	\
-doomtype.h  info.h      m_swap.c    p_sight.c   r_segs.h    w_wad.h	\
-d_player.h  i_sound.c   m_swap.h    p_spec.c    r_sky.c     z_zone.c	\
-dstrings.c  i_sound.h   p_ceilng.c  p_spec.h    r_sky.h     z_zone.h	\
-dstrings.h  i_system.c  p_doors.c   p_switch.c  r_state.h   mmus2mid.c  \
-d_textur.h  i_system.h  p_enemy.c   p_telept.c  r_things.c  mmus2mid.h  \
-deh_defs.h  deh_frame.c deh_main.c  deh_ptr.c   deh_text.c  deh_thing.c \
-deh_io.c    deh_io.h    deh_ammo.c  deh_cheat.c deh_weapon.c            \
-deh_misc.c  deh_misc.h  deh_sound.c deh_main.h  doomfeatures.h          \
-w_merge.c   w_merge.h   deh_mapping.c deh_mapping.h                     \
-net_defs.h  net_io.h    net_loop.h    net_packet.h  net_sdl.h           \
-net_io.c    net_loop.c  net_packet.c  net_sdl.c 
+am_map.c             am_map.h              \
+deh_ammo.c                                 \
+deh_cheat.c                                \
+deh_defs.h                                 \
+deh_frame.c                                \
+deh_io.c             deh_io.h              \
+deh_main.c           deh_main.h            \
+deh_mapping.c        deh_mapping.h         \
+deh_misc.c           deh_misc.h            \
+deh_ptr.c                                  \
+deh_sound.c                                \
+deh_text.c                                 \
+deh_thing.c                                \
+deh_weapon.c                               \
+d_englsh.h                                 \
+d_event.h                                  \
+d_french.h                                 \
+d_items.c            d_items.h             \
+d_main.c             d_main.h              \
+d_net.c              d_net.h               \
+doomdata.h                                 \
+doomdef.c            doomdef.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                                   \
+i_net.c              i_net.h               \
+info.c               info.h                \
+i_sound.c            i_sound.h             \
+i_system.c           i_system.h            \
+i_video.c            i_video.h             \
+m_argv.c             m_argv.h              \
+m_bbox.c             m_bbox.h              \
+m_cheat.c            m_cheat.h             \
+m_fixed.c            m_fixed.h             \
+m_menu.c             m_menu.h              \
+m_misc.c             m_misc.h              \
+mmus2mid.c           mmus2mid.h            \
+m_random.c           m_random.h            \
+m_swap.c             m_swap.h              \
+net_client.c                               \
+net_defs.h                                 \
+net_io.c             net_io.h              \
+net_loop.c           net_loop.h            \
+net_packet.c         net_packet.h          \
+net_sdl.c            net_sdl.h             \
+net_server.c         net_server.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_merge.c            w_merge.h             \
+w_wad.c              w_wad.h               \
+z_zone.c             z_zone.h   
 
 if HAVE_WINDRES
 chocolate_doom_SOURCES=$(SOURCE_FILES) chocolate-doom-res.rc