refactor include directory

AlexOberhofer · Dec 26, 2021 · 9f663e8 · 9f663e8
1 parent 70d1b6a
commit 9f663e8
Show file tree

Hide file tree

Showing 101 changed files with 973 additions and 4 deletions.
diff --git a/src/am_map.h → include/am_map.h b/src/am_map.h → include/am_map.h
diff --git a/src/config.h → include/config.h b/src/config.h → include/config.h
@@ -19,7 +19,7 @@
 #undef HAVE_LIBI386
 
 /* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
+#define HAVE_LIBM 1
 
 /* Define to 1 if you have the `png' library (-lpng). */
 #undef HAVE_LIBPNG
@@ -70,10 +70,10 @@
 #undef PACKAGE_BUGREPORT
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "SDL2-Doom - Based on Doom Generic"
+#define PACKAGE_NAME "SDL2-Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "SDL2-Doom - Based on Doom Generic 0.1"
+#define PACKAGE_STRING "SDL2-Doom"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sdl2-doom.tar"

diff --git a/src/d_englsh.h → include/d_englsh.h b/src/d_englsh.h → include/d_englsh.h
diff --git a/src/d_event.h → include/d_event.h b/src/d_event.h → include/d_event.h
diff --git a/src/d_items.h → include/d_items.h b/src/d_items.h → include/d_items.h
diff --git a/src/d_iwad.h → include/d_iwad.h b/src/d_iwad.h → include/d_iwad.h
diff --git a/src/d_loop.h → include/d_loop.h b/src/d_loop.h → include/d_loop.h
diff --git a/src/d_main.h → include/d_main.h b/src/d_main.h → include/d_main.h
diff --git a/src/d_mode.h → include/d_mode.h b/src/d_mode.h → include/d_mode.h
diff --git a/src/d_player.h → include/d_player.h b/src/d_player.h → include/d_player.h
diff --git a/src/d_textur.h → include/d_textur.h b/src/d_textur.h → include/d_textur.h
diff --git a/src/d_think.h → include/d_think.h b/src/d_think.h → include/d_think.h
diff --git a/src/d_ticcmd.h → include/d_ticcmd.h b/src/d_ticcmd.h → include/d_ticcmd.h
diff --git a/src/deh_main.h → include/deh_main.h b/src/deh_main.h → include/deh_main.h
diff --git a/src/deh_misc.h → include/deh_misc.h b/src/deh_misc.h → include/deh_misc.h
diff --git a/src/deh_str.h → include/deh_str.h b/src/deh_str.h → include/deh_str.h
diff --git a/src/doom.h → include/doom.h b/src/doom.h → include/doom.h
diff --git a/src/doomdata.h → include/doomdata.h b/src/doomdata.h → include/doomdata.h
diff --git a/src/doomdef.h → include/doomdef.h b/src/doomdef.h → include/doomdef.h
diff --git a/src/doomfeatures.h → include/doomfeatures.h b/src/doomfeatures.h → include/doomfeatures.h
diff --git a/src/doomgeneric.h → include/doomgeneric.h b/src/doomgeneric.h → include/doomgeneric.h
diff --git a/src/doomkeys.h → include/doomkeys.h b/src/doomkeys.h → include/doomkeys.h
diff --git a/src/doomstat.h → include/doomstat.h b/src/doomstat.h → include/doomstat.h
diff --git a/src/doomtype.h → include/doomtype.h b/src/doomtype.h → include/doomtype.h
diff --git a/src/dstrings.h → include/dstrings.h b/src/dstrings.h → include/dstrings.h
diff --git a/src/f_finale.h → include/f_finale.h b/src/f_finale.h → include/f_finale.h
diff --git a/src/f_wipe.h → include/f_wipe.h b/src/f_wipe.h → include/f_wipe.h
diff --git a/src/g_game.h → include/g_game.h b/src/g_game.h → include/g_game.h
diff --git a/src/gusconf.h → include/gusconf.h b/src/gusconf.h → include/gusconf.h
diff --git a/src/hu_lib.h → include/hu_lib.h b/src/hu_lib.h → include/hu_lib.h
diff --git a/src/hu_stuff.h → include/hu_stuff.h b/src/hu_stuff.h → include/hu_stuff.h
diff --git a/src/i_cdmus.h → include/i_cdmus.h b/src/i_cdmus.h → include/i_cdmus.h
diff --git a/src/i_endoom.h → include/i_endoom.h b/src/i_endoom.h → include/i_endoom.h
diff --git a/src/i_joystick.h → include/i_joystick.h b/src/i_joystick.h → include/i_joystick.h
diff --git a/src/i_scale.h → include/i_scale.h b/src/i_scale.h → include/i_scale.h
diff --git a/src/i_sound.h → include/i_sound.h b/src/i_sound.h → include/i_sound.h
diff --git a/src/i_swap.h → include/i_swap.h b/src/i_swap.h → include/i_swap.h
@@ -41,5 +41,17 @@
 #define SYS_BIG_ENDIAN
 #endif
 
+// cosmito from lsdldoom
+#define doom_swap_s(x) \
+        ((short int)((((unsigned short int)(x) & 0x00ff) << 8) | \
+                              (((unsigned short int)(x) & 0xff00) >> 8))) 
+
+
+#if ( SDL_BYTEORDER == SDL_BIG_ENDIAN )
+#define doom_wtohs(x) doom_swap_s(x)
+#else
+#define doom_wtohs(x) (short int)(x)
+#endif
+
 #endif
 
diff --git a/src/i_system.h → include/i_system.h b/src/i_system.h → include/i_system.h
diff --git a/src/i_timer.h → include/i_timer.h b/src/i_timer.h → include/i_timer.h
diff --git a/src/i_video.h → include/i_video.h b/src/i_video.h → include/i_video.h
diff --git a/src/info.h → include/info.h b/src/info.h → include/info.h
diff --git a/src/m_argv.h → include/m_argv.h b/src/m_argv.h → include/m_argv.h
diff --git a/src/m_bbox.h → include/m_bbox.h b/src/m_bbox.h → include/m_bbox.h
diff --git a/src/m_cheat.h → include/m_cheat.h b/src/m_cheat.h → include/m_cheat.h
diff --git a/src/m_config.h → include/m_config.h b/src/m_config.h → include/m_config.h
diff --git a/src/m_controls.h → include/m_controls.h b/src/m_controls.h → include/m_controls.h
diff --git a/src/m_fixed.h → include/m_fixed.h b/src/m_fixed.h → include/m_fixed.h
diff --git a/src/m_menu.h → include/m_menu.h b/src/m_menu.h → include/m_menu.h
diff --git a/src/m_misc.h → include/m_misc.h b/src/m_misc.h → include/m_misc.h
diff --git a/src/m_random.h → include/m_random.h b/src/m_random.h → include/m_random.h
diff --git a/src/memio.h → include/memio.h b/src/memio.h → include/memio.h
diff --git a/include/mmus2mid.h b/include/mmus2mid.h
@@ -0,0 +1,80 @@
+// Emacs style mode select   -*- C++ -*- 
+//--------------------------------------------------------------------------
+//
+// $Id: mmus2mid.h 76 2005-09-06 21:06:45Z fraggle $
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+//  Copyright (C) 1999 by
+//  id Software, Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
+//  Copyright (C) 1999-2000 by
+//  Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
+//
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// $Log$
+// Revision 1.2  2005/09/06 21:06:45  fraggle
+// Newer versions of mmus2mid.c,h from prboom
+//
+// Revision 1.1  2005/09/05 22:50:56  fraggle
+// Add mmus2mid code from prboom.  Use 'void *' for music handles.  Pass
+// length of data when registering music.
+//
+
+#if !defined( MMUS2MID_H )
+#define MMUS2MID_H
+
+// error codes
+
+typedef enum
+{
+  MUSDATACOR,    // MUS data corrupt
+  TOOMCHAN,      // Too many channels
+  MEMALLOC,      // Memory allocation error
+  MUSDATAMT,     // MUS file empty
+  BADMUSCTL,     // MUS event 5 or 7 found
+  BADSYSEVT,     // MUS system event not in 10-14 range
+  BADCTLCHG,     // MUS control change larger than 9
+  TRACKOVF,      // MIDI track exceeds allocation
+  BADMIDHDR,     // bad midi header detected
+} error_code_t;
+
+// some names for integers of various sizes, all unsigned
+typedef unsigned char UBYTE;  // a one-byte int
+typedef unsigned short UWORD; // a two-byte int
+// proff: changed from unsigned int to unsigned long to avoid warning
+typedef unsigned long ULONG;   // a four-byte int (assumes int 4 bytes)
+
+#ifndef MSDOS /* proff: This is from allegro.h */
+#define MIDI_TRACKS           32
+
+typedef struct MIDI                    /* a midi file */
+{
+   int divisions;                      /* number of ticks per quarter note */
+   struct {
+      unsigned char *data;             /* MIDI message stream */
+      int len;                         /* length of the track data */
+   } track[MIDI_TRACKS];
+} MIDI;
+#endif /* !MSDOS */
+
+extern int mmus2mid(const UBYTE *mus,MIDI *mid, UWORD division, int nocomp);
+extern void free_mididata(MIDI *mid);
+extern int MIDIToMidi(MIDI *mididata,UBYTE **mid,int *midlen);
+extern int MidiToMIDI(UBYTE *mid,MIDI *mididata);
+
+#endif
diff --git a/src/net_client.h → include/net_client.h b/src/net_client.h → include/net_client.h
diff --git a/src/net_dedicated.h → include/net_dedicated.h b/src/net_dedicated.h → include/net_dedicated.h
diff --git a/src/net_defs.h → include/net_defs.h b/src/net_defs.h → include/net_defs.h
diff --git a/src/net_gui.h → include/net_gui.h b/src/net_gui.h → include/net_gui.h
diff --git a/src/net_io.h → include/net_io.h b/src/net_io.h → include/net_io.h
diff --git a/src/net_loop.h → include/net_loop.h b/src/net_loop.h → include/net_loop.h
diff --git a/src/net_packet.h → include/net_packet.h b/src/net_packet.h → include/net_packet.h
diff --git a/src/net_query.h → include/net_query.h b/src/net_query.h → include/net_query.h
diff --git a/src/net_sdl.h → include/net_sdl.h b/src/net_sdl.h → include/net_sdl.h
diff --git a/src/net_server.h → include/net_server.h b/src/net_server.h → include/net_server.h
diff --git a/src/p_inter.h → include/p_inter.h b/src/p_inter.h → include/p_inter.h
diff --git a/src/p_local.h → include/p_local.h b/src/p_local.h → include/p_local.h
diff --git a/src/p_mobj.h → include/p_mobj.h b/src/p_mobj.h → include/p_mobj.h
diff --git a/src/p_pspr.h → include/p_pspr.h b/src/p_pspr.h → include/p_pspr.h
diff --git a/src/p_saveg.h → include/p_saveg.h b/src/p_saveg.h → include/p_saveg.h
diff --git a/src/p_setup.h → include/p_setup.h b/src/p_setup.h → include/p_setup.h
diff --git a/src/p_spec.h → include/p_spec.h b/src/p_spec.h → include/p_spec.h
diff --git a/src/p_tick.h → include/p_tick.h b/src/p_tick.h → include/p_tick.h
diff --git a/src/r_bsp.h → include/r_bsp.h b/src/r_bsp.h → include/r_bsp.h
diff --git a/src/r_data.h → include/r_data.h b/src/r_data.h → include/r_data.h
diff --git a/src/r_defs.h → include/r_defs.h b/src/r_defs.h → include/r_defs.h
diff --git a/src/r_draw.h → include/r_draw.h b/src/r_draw.h → include/r_draw.h
diff --git a/src/r_local.h → include/r_local.h b/src/r_local.h → include/r_local.h
diff --git a/src/r_main.h → include/r_main.h b/src/r_main.h → include/r_main.h
diff --git a/src/r_plane.h → include/r_plane.h b/src/r_plane.h → include/r_plane.h
diff --git a/src/r_segs.h → include/r_segs.h b/src/r_segs.h → include/r_segs.h
diff --git a/src/r_sky.h → include/r_sky.h b/src/r_sky.h → include/r_sky.h
diff --git a/src/r_state.h → include/r_state.h b/src/r_state.h → include/r_state.h
diff --git a/src/r_things.h → include/r_things.h b/src/r_things.h → include/r_things.h
diff --git a/src/s_sound.h → include/s_sound.h b/src/s_sound.h → include/s_sound.h
diff --git a/src/sha1.h → include/sha1.h b/src/sha1.h → include/sha1.h
diff --git a/src/sounds.h → include/sounds.h b/src/sounds.h → include/sounds.h
diff --git a/src/st_lib.h → include/st_lib.h b/src/st_lib.h → include/st_lib.h
diff --git a/src/st_stuff.h → include/st_stuff.h b/src/st_stuff.h → include/st_stuff.h
diff --git a/src/statdump.h → include/statdump.h b/src/statdump.h → include/statdump.h
diff --git a/src/tables.h → include/tables.h b/src/tables.h → include/tables.h
diff --git a/src/v_patch.h → include/v_patch.h b/src/v_patch.h → include/v_patch.h
diff --git a/src/v_video.h → include/v_video.h b/src/v_video.h → include/v_video.h
diff --git a/src/w_checksum.h → include/w_checksum.h b/src/w_checksum.h → include/w_checksum.h
diff --git a/src/w_file.h → include/w_file.h b/src/w_file.h → include/w_file.h
diff --git a/src/w_main.h → include/w_main.h b/src/w_main.h → include/w_main.h
diff --git a/src/w_merge.h → include/w_merge.h b/src/w_merge.h → include/w_merge.h
diff --git a/src/w_wad.h → include/w_wad.h b/src/w_wad.h → include/w_wad.h
diff --git a/src/wi_stuff.h → include/wi_stuff.h b/src/wi_stuff.h → include/wi_stuff.h
diff --git a/src/z_zone.h → include/z_zone.h b/src/z_zone.h → include/z_zone.h
diff --git a/src/i_timer.c b/src/i_timer.c
@@ -80,6 +80,7 @@ void I_WaitVBL(int count)
 
 void I_InitTimer(void)
 {
+    printf("I_InitTimer: Setting up timer.\n");
     if (SDL_Init(SDL_INIT_TIMER) < 0)
 	{
           printf("SDL_Init failed: %s\n", SDL_GetError());

diff --git a/src/makefile b/src/makefile
@@ -1,5 +1,6 @@
 SDL_CFLAGS = -D_THREAD_SAFE -I/usr/include/SDL2
 SDL_LIBS =
+INCLUDES=-I../include
 CC=gcc
 CFLAGS+= $(INCLUDES) $(SDL_CFLAGS)
 CFLAGS+=-Wall -DNORMALUNIX

diff --git a/src/makefile.mingw b/src/makefile.mingw
@@ -1,6 +1,8 @@
 SDL_CFLAGS = -D_THREAD_SAFE -I/usr/include/SDL2 -I../SDL2-2.0.18/x86_64-w64-mingw32/include 
 SDL_LIBS = 
 
+INCLUDES=-I../include
+
 CC=x86_64-w64-mingw32-gcc
 CFLAGS+= $(INCLUDES) $(SDL_CFLAGS)
 CFLAGS+=-Wall -DNORMALUNIX 
@@ -10,7 +12,7 @@ LIBS+=-lm -lSDL2 -L../SDL2-2.0.18/x86_64-w64-mingw32/lib
 OBJDIR=build
 OUTPUT=sdl2-doom.exe
 
-SRC_DOOM = i_main.o dummy.o am_map.o doomdef.o doomstat.o dstrings.o d_event.o d_items.o d_iwad.o d_loop.o d_main.o d_mode.o d_net.o f_finale.o f_wipe.o g_game.o hu_lib.o hu_stuff.o info.o i_cdmus.o i_endoom.o i_joystick.o i_scale.o i_sound.o i_system.o i_timer.o memio.o m_argv.o m_bbox.o m_cheat.o m_config.o m_controls.o m_fixed.o m_menu.o m_misc.o m_random.o p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o p_map.o p_maputl.o p_mobj.o p_plats.o p_pspr.o p_saveg.o p_setup.o p_sight.o p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o r_draw.o r_main.o r_plane.o r_segs.o r_sky.o r_things.o sha1.o sounds.o statdump.o st_lib.o st_stuff.o s_sound.o tables.o v_video.o wi_stuff.o w_checksum.o w_file.o w_main.o w_wad.o z_zone.o w_file_stdc.o i_input.o i_video.o i_sdl.o
+SRC_DOOM = i_main.o dummy.o am_map.o doomdef.o doomstat.o dstrings.o d_event.o d_items.o d_iwad.o d_loop.o d_main.o d_mode.o mmus2mid.o d_net.o f_finale.o f_wipe.o g_game.o hu_lib.o hu_stuff.o info.o i_cdmus.o i_endoom.o i_joystick.o i_scale.o i_sound.o i_system.o i_timer.o memio.o m_argv.o m_bbox.o m_cheat.o m_config.o m_controls.o m_fixed.o m_menu.o m_misc.o m_random.o p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o p_map.o p_maputl.o p_mobj.o p_plats.o p_pspr.o p_saveg.o p_setup.o p_sight.o p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o r_draw.o r_main.o r_plane.o r_segs.o r_sky.o r_things.o sha1.o sounds.o statdump.o st_lib.o st_stuff.o s_sound.o tables.o v_video.o wi_stuff.o w_checksum.o w_file.o w_main.o w_wad.o z_zone.o w_file_stdc.o i_input.o i_video.o i_sdl.o
 OBJS += $(addprefix $(OBJDIR)/, $(SRC_DOOM))
 
 all:     $(OUTPUT)