Merge pull request #13 from turol/dos

DOS support with Allegro and DJGPP

Author: ozkl

.gitignore

@@ -1,8 +1,10 @@
 *.o
 *.obj
+*.exe
 *.DS_Store
 *.log
 *.user
+*~
 .vs/
 Debug/
-Release/
+Release/

doomgeneric/Makefile.djgpp

@@ -0,0 +1,71 @@
+################################################################
+#
+# $Id:$
+#
+# $Log:$
+#
+
+.PHONY: all clean print
+
+.SUFFIXES:
+
+ifeq ($(V),1)
+	VB=''
+else
+	VB=@
+endif
+
+
+
+CC:=i386-pc-msdosdjgpp-gcc
+OPTFLAGS:=-O3
+CFLAGS+=-std=gnu89
+CFLAGS+=$(OPTFLAGS)
+CFLAGS+=-Werror
+CFLAGS+=-DDOOMGENERIC_RESX=320 -DDOOMGENERIC_RESY=200
+CFLAGS+=-DFEATURE_SOUND=1
+CFLAGS+=-DCMAP256
+
+# link time optimization, no significant effect on performance
+# CFLAGS+=-flto
+# LDFLAGS+=-flto $(OPTFLAGS)
+
+# debug
+# CFLAGS+=-g
+# LDFLAGS+=-g
+
+LIBS+=-lalleg
+#LIBS+=-lalld # debug library
+
+# subdirectory for objects
+OBJDIR:=djgpp
+OUTPUT:=doomgen.exe
+
+SRC_DOOM = 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 doomgeneric.o doomgeneric_allegro.o mus2mid.o i_allegromusic.o i_allegrosound.o
+OBJS += $(addprefix $(OBJDIR)/, $(SRC_DOOM))
+
+all:	 $(OUTPUT)
+
+clean:
+	rm -rf $(OBJDIR)
+	rm -f $(OUTPUT)
+	rm -f $(OUTPUT).gdb
+	rm -f $(OUTPUT).map
+
+$(OUTPUT):	$(OBJS)
+	@echo [Linking $@]
+	$(VB)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) \
+	-o $(OUTPUT) $(LIBS)
+
+$(OBJS): | $(OBJDIR)
+
+$(OBJDIR):
+	mkdir -p $(OBJDIR)
+
+$(OBJDIR)/%.o:	%.c
+	@echo [Compiling $<]
+	$(VB)$(CC) $(CFLAGS) -c $< -o $@
+
+print:
+	@echo OBJS: $(OBJS)
+

doomgeneric/doomgeneric.c

@@ -4,7 +4,7 @@
 
 #include "doomgeneric.h"
 
-uint32_t* DG_ScreenBuffer = 0;
+pixel_t* DG_ScreenBuffer = NULL;
 
 void M_FindResponseFile(void);
 void D_DoomMain (void);

doomgeneric/doomgeneric.h

@@ -4,11 +4,27 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#ifndef DOOMGENERIC_RESX
 #define DOOMGENERIC_RESX 640
+#endif  // DOOMGENERIC_RESX
+
+#ifndef DOOMGENERIC_RESY
 #define DOOMGENERIC_RESY 400
+#endif  // DOOMGENERIC_RESY
+
+
+#ifdef CMAP256
+
+typedef uint8_t pixel_t;
+
+#else  // CMAP256
+
+typedef uint32_t pixel_t;
+
+#endif  // CMAP256
 
 
-extern uint32_t* DG_ScreenBuffer;
+extern pixel_t* DG_ScreenBuffer;
 
 void doomgeneric_Create(int argc, char **argv);
 void doomgeneric_Tick();