From 4b5070cd9f21a58f57c66a2600f87447cbf7f743 Mon Sep 17 00:00:00 2001 From: Steve Dalbke Date: Tue, 22 Oct 2024 18:41:19 -0500 Subject: [PATCH] update makefiles to work with latest rgbds --- Makefile | 2 +- project.mk | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1eb14f8..1e13d44 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ ROM = $(BINDIR)/$(ROMNAME).$(ROMEXT) # Argument constants INCDIRS = src/ src/include/ src/bin/ WARNINGS = all extra -ASFLAGS = -v -L -p $(PADVALUE) $(addprefix -i,$(INCDIRS)) $(addprefix -W,$(WARNINGS)) +ASFLAGS = -v -p $(PADVALUE) $(addprefix --include ,$(INCDIRS)) $(addprefix -W,$(WARNINGS)) LDFLAGS = -p $(PADVALUE) FIXFLAGS = -p $(PADVALUE) -v -i "$(GAMEID)" -k "$(LICENSEE)" -l $(OLDLIC) -m $(MBC) -n $(VERSION) -r $(SRAMSIZE) -t $(TITLE) diff --git a/project.mk b/project.mk index 07c91c1..c3136ea 100644 --- a/project.mk +++ b/project.mk @@ -40,9 +40,6 @@ ROMEXT := gb # Compilation parameters, uncomment to apply, comment to cancel # "Sensible defaults" are included -# Disable automatic `nop` after `halt` -ASFLAGS += -h - # Export all labels # This means they must all have unique names, but they will all show up in the # .sym and .map files