General cleanup of source tree to allow building with -Werror enabled

.gitignore

@@ -54,3 +54,12 @@ source/iwad/doom64.c
 source/iwad/
 
 .qtc_clangd/
+GBADoom
+GBADoomCpp
+cppbuild/am_map.o cppbuild/d_client.o cppbuild/d_items.o cppbuild/d_main.o cppbuild/doom_iwad.o cppbuild/f_finale.o cppbuild/f_wipe.o cppbuild/g_game.o cppbuild/global_data.o cppbuild/hu_lib.o cppbuild/hu_stuff.o cppbuild/i_audio.o cppbuild/i_main.o cppbuild/i_system_e32.o cppbuild/i_system.o cppbuild/i_video.o cppbuild/info.o cppbuild/lprintf.o cppbuild/m_bbox.o cppbuild/m_cheat.o cppbuild/m_menu.o cppbuild/m_random.o cppbuild/m_recip.o cppbuild/p_ceilng.o cppbuild/p_doors.o cppbuild/p_enemy.o cppbuild/p_floor.o cppbuild/p_genlin.o cppbuild/p_inter.o cppbuild/p_lights.o cppbuild/p_map.o cppbuild/p_maputl.o cppbuild/p_mobj.o cppbuild/p_plats.o cppbuild/p_pspr.o cppbuild/p_setup.o cppbuild/p_sight.o cppbuild/p_spec.o cppbuild/p_switch.o cppbuild/p_telept.o cppbuild/p_tick.o cppbuild/p_user.o cppbuild/r_data.o cppbuild/r_draw.o cppbuild/r_hotpath.iwram.o cppbuild/r_main.o cppbuild/r_patch.o cppbuild/r_plane.o cppbuild/r_things.o cppbuild/s_sound.o cppbuild/sounds.o cppbuild/st_gfx.o cppbuild/st_lib.o cppbuild/st_stuff.o cppbuild/tables.o cppbuild/v_video.o cppbuild/version.o cppbuild/w_wad.o cppbuild/wi_stuff.o cppbuild/z_bmalloc.o cppbuild/z_zone_rpt.o cppbuild/z_zone.o
+cppbuild
+
+*.gif
+
+**/screenbuffers/*.raw
+**/screenbuffers

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug",
+            "program": "${workspaceFolder}/GBADoomCpp",
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,35 @@
+{
+    "makefile.makefilePath": "",
+    "makefile.launchConfigurations": [
+        {
+            "cwd": "/Users/brian/src/GBADoom",
+            "binaryPath": "/Users/brian/src/GBADoom/GBADoom",
+            "binaryArgs": []
+        },
+        {
+            "cwd": "/Users/brian/src/GBADoom",
+            "binaryPath": "/Users/brian/src/GBADoom/GBADoomCpp",
+            "binaryArgs": []
+        }
+    ],
+    "files.associations": {
+        "bitset": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "__hash_table": "cpp",
+        "__split_buffer": "cpp",
+        "__tree": "cpp",
+        "array": "cpp",
+        "deque": "cpp",
+        "initializer_list": "cpp",
+        "list": "cpp",
+        "queue": "cpp",
+        "span": "cpp",
+        "stack": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "vector": "cpp"
+    }
+}

GBADoom.pro

@@ -168,7 +168,7 @@ HEADERS += \
     include/tables.h \
     include/v_video.h \
     include/version.h \
-    include/w_wad.h \
+
     include/wi_stuff.h \
     include/z_bmalloc.h \
     include/z_zone.h

Makefile

@@ -1,177 +1,106 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-endif
-
-include $(DEVKITARM)/gba_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# INCLUDES is a list of directories containing extra header files
-# DATA is a list of directories containing binary data
-# GRAPHICS is a list of directories containing files to be processed by grit
-#
-# All directories are specified relative to the project directory where
-# the makefile is found
-#
-#---------------------------------------------------------------------------------
-TARGET		:= $(notdir $(CURDIR))
-BUILD		:= build
-SOURCES		:= source
-INCLUDES	:= include
-DATA		:= data
-MUSIC		:= music
-
-#---------------------------------------------------------------------------------
-# Disable LTO for IWRAM
-#---------------------------------------------------------------------------------
-%.iwram.o: %.iwram.cpp
-	$(SILENTMSG) $(notdir $<)
-	$(SILENTCMD)$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.iwram.d $(CXXFLAGS) -fno-lto -marm -c $< -o $@ $(ERROR_FILTER)
-
-#---------------------------------------------------------------------------------
-%.iwram.o: %.iwram.c
-	$(SILENTMSG) $(notdir $<)
-	$(SILENTCMD)$(CC) -MMD -MP -MF $(DEPSDIR)/$*.iwram.d $(CFLAGS) -fno-lto -marm -c $< -o $@ $(ERROR_FILTER)
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-mthumb -mthumb-interwork
-
-CFLAGS	:=	-g -Wall -O3 -fgcse-after-reload -gdwarf-4\
-                -mcpu=arm7tdmi -mtune=arm7tdmi -flto=8\
-                -fallow-store-data-races -fpermissive\
-                -DGBA\
-		$(ARCH)
-
-CFLAGS	+=	$(INCLUDE) -std=gnu11
-
-CXXFLAGS:=	$(CFLAGS) -fno-rtti -fno-exceptions
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-#---------------------------------------------------------------------------------
-# any extra libraries we wish to link with the project
-#---------------------------------------------------------------------------------
-LIBS	:= -lmm -lgba
-
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=	$(LIBGBA)
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-
-
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-ifneq ($(strip $(MUSIC)),)
-	export AUDIOFILES	:=	$(foreach dir,$(notdir $(wildcard $(MUSIC)/*.*)),$(CURDIR)/$(MUSIC)/$(dir))
-	BINFILES += soundbank.bin
-endif
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_BIN := $(addsuffix .o,$(BINFILES))
-
-export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-
-export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
-
-export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES)))
+# Simple Makefile for GBADoom (Qt6, macOS, Apple Silicon)
 
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-iquote $(CURDIR)/$(dir)) \
-					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD)
+# ---- Project -----------------------------------------------------
 
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+TARGET      := GBADoomCpp
 
-.PHONY: $(BUILD) clean
+SRC_DIR     := cppsrc
+OBJ_DIR     := cppbuild
 
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+# Use all C sources in source/, plus the C++ ones we know about.
+# (If you add more .cpp files, just drop them in $(SRC_DIR)/)
+CPP_SOURCES := $(wildcard $(SRC_DIR)/*.cc)
 
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(TARGET).elf $(TARGET).gba
+SRCS        := $(CPP_SOURCES)
+
+# Port specific source files
+SRCS += ports/qt/i_system_e32.cc
+SRCS += ports/qt/wadfilereader.cc
+SRCS += ports/qt/i_main.cc
+
+
+# ---- Original Doom Sources --------------------------------------------
+#SRCS += ../../gamedata/original/doom_iwad.cc
+#SRCS += ../../gamedata/original/w_wad.cc
+#SRCS += ../../gamedata/original/w_nc.cc
+#SRCS += ../../gamedata/original/z_bmalloc.cc
+#vpath %.cc $(SRC_DIR) ../../gamedata/original
+
+# ---- Guardmalloc Sources ----------------------------------------
+#SRCS += ../../gamedata/original/doom_iwad.cc
+#SRCS += ../../gamedata/original/w_wad.cc
+#SRCS += ../../gamedata/original/z_bmalloc.cc
+#SRCS += ../../gamedata/guard/w_nc.cc
+#SRCS += guardmalloc/guardmalloc.cc
+#vpath %.cc guardmalloc ../../gamedata/guard ../../gamedata/original $(SRC_DIR)
+
+# ---- Minimem Sources ----------------------------------------
+SRCS += gamedata/minimem/w_nc.cc
+SRCS += gamedata/minimem/tagheap.cc
+SRCS += gamedata/minimem/z_mem_emu.cc
+SRCS += gamedata/minimem/w_lumps.cc
+SRCS += gamedata/minimem/gbadoom1_lumps.cc
+vpath %.cc gamedata/minimem ports/qt $(SRC_DIR)
+
+
+# ---- Objects -----------------------------------------------------
+OBJS        := $(patsubst %.cc,$(OBJ_DIR)/%.o,$(notdir $(SRCS)))
 
+# ---- Toolchain ---------------------------------------------------
 
-#---------------------------------------------------------------------------------
-else
+CXX         := clang++
+CC          := clang
+AR          := ar
+RM          := rm -f
+MKDIR_P     := mkdir -p
 
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
+# QT configuration
+QT_MODULE   := Qt6Widgets
+QT_CFLAGS   := $(shell pkg-config --cflags $(QT_MODULE))
+QT_LIBS     := $(shell pkg-config --libs $(QT_MODULE))
 
-$(OUTPUT).gba	:	$(OUTPUT).elf
+# ---- Flags / Defines ---------------------------------------------
 
-$(OUTPUT).elf	:	$(OFILES)
+DEFINES     := \
+    -DQT_DEPRECATED_WARNINGS \
+    -DRANGECHECK \
+	-DRPT_MALLOC \
+    -D_CRT_SECURE_NO_WARNINGS \
 
-$(OFILES_SOURCES) : $(HFILES)
+INCLUDEPATH := \
+    -Iinclude \
+	-Igamedata/minimem \
+	-Iports/qt
 
-#---------------------------------------------------------------------------------
-# The bin2o rule should be copied and modified
-# for each extension used in the data directories
-#---------------------------------------------------------------------------------
+CXXFLAGS    := -std=c++17 -Wall -Wextra -Werror -Wno-unknown-pragmas  -Os $(DEFINES) $(INCLUDEPATH)
+CFLAGS      += $(QT_CFLAGS)
+CXXFLAGS    += $(QT_CFLAGS)
 
-#---------------------------------------------------------------------------------
-# rule to build soundbank from music files
-#---------------------------------------------------------------------------------
-soundbank.bin soundbank.h : $(AUDIOFILES)
-#---------------------------------------------------------------------------------
-	@mmutil $^ -osoundbank.bin -hsoundbank.h
+LDFLAGS     := $(QT_LIBS)
 
-#---------------------------------------------------------------------------------
-# This rule links in binary data with the .wad extension
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
+# ---- Targets -----------------------------------------------------
+
+.PHONY: all clean distclean run
+
+all: $(TARGET)
+
+$(TARGET): $(OBJ_DIR) $(OBJS)
+	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
+
+$(OBJ_DIR):
+	$(MKDIR_P) $(OBJ_DIR)
+
+
+# C++ compilation rule - works for .cc files from any directory in vpath
+$(OBJ_DIR)/%.o: %.cc
+	$(MKDIR_P) $(OBJ_DIR)
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+clean:
+	$(RM) $(OBJ_DIR)/*.o
 
+distclean: clean
+	$(RM) $(TARGET)
 
--include $(DEPSDIR)/*.d
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
+run: all
+	./$(TARGET)

README.md

@@ -1,5 +1,19 @@
 ## GBADoom
 
+This is a modified version of the original GBADoom. It is rewritten to C++11 to
+allow use of a stronger type system around caching of lumps. This in turn allows
+more aggressive caching strategies where objects are loaded from flash on
+demand - possibly even external flash. The goal is to have a port that is very
+light on RAM requirements for platforms such as microcontrollers that have
+large program memory areas (typically flash) but small RAM areas. GBADoom is
+the starting point as a number of memory reducing efforts had already been done.
+
+The memory allocation in this build only allows for compatibilty with the Doom1
+wad, so what is stated below around compatibility is no longer true. 
+
+
+Original README below:
+
 A port of prBoom to the GBA.
 
 **What's hot?**