Patch test projects so they build without deprecated features

Also ensure the test scripts pass shellcheck
This commit is contained in:
Rangi42
2024-03-28 16:45:45 -04:00
committed by Sylvie
parent ccfd3b6af8
commit 9dac583e45
6 changed files with 89 additions and 32 deletions

View File

@@ -0,0 +1,15 @@
diff --git a/Makefile b/Makefile
index d05ccba..1011447 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,7 @@ RGBDS :=
ASM := $(RGBDS)rgbasm
ASFLAGS := \
- --export-all\
- --halt-without-nop\
- --preserve-ld
+ --export-all
LD := $(RGBDS)rgblink
LDFLAGS :=

17
test/patches/libbet.patch Normal file
View File

@@ -0,0 +1,17 @@
diff --git a/makefile b/makefile
index 6513518..35826eb 100644
--- a/makefile
+++ b/makefile
@@ -85,10 +85,10 @@ $(title).gb: $(objlisto)
$(RGBFIX) -jvsc -k "OK" -l 0x33 -m ROM -p 0xFF -t "LIBBET" -v $@
obj/gb/%.o: src/%.z80 src/hardware.inc src/global.inc
- ${RGBASM} -h -o $@ $<
+ ${RGBASM} -o $@ $<
obj/gb/%.o: obj/gb/%.z80
- ${RGBASM} -h -o $@ $<
+ ${RGBASM} -o $@ $<
# Files that will be included with incbin

25
test/patches/ucity.patch Normal file
View File

@@ -0,0 +1,25 @@
diff --git a/Makefile b/Makefile
index 22c65e9..e7c888d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ ASMFILES := $(foreach dir,$(SOURCE_ALL_DIRS),$(wildcard $(dir)/*.asm))
# List of include directories: All source and data folders.
# A '/' is appended to the path.
-INCLUDES := $(foreach dir,$(SOURCE_ALL_DIRS),-i$(dir)/)
+INCLUDES := $(foreach dir,$(SOURCE_ALL_DIRS),-I$(dir)/)
# Prepare object paths from source files.
OBJ := $(ASMFILES:.asm=.obj)
@@ -72,10 +72,9 @@ clean:
@echo rm $(OBJ) $(BIN) $(COMPAT_BIN) $(NAME).sym $(NAME).map
@rm -f $(OBJ) $(BIN) $(COMPAT_BIN) $(NAME).sym $(NAME).map
-# TODO: Remove the -h when RGBASM is updated to remove it
%.obj : %.asm
@echo rgbasm $<
- @$(RGBASM) $(INCLUDES) -h -E -o$@ $<
+ @$(RGBASM) $(INCLUDES) -E -o$@ $<
$(BIN): $(OBJ)
@echo rgblink $(BIN)