mirror of
https://github.com/gbdev/rgbds.git
synced 2025-11-21 18:52:07 +00:00
996db14ffa
The Python Pillow image library gives different output for `Image.getcolors()` in version 9 than version 10. This causes libbet's SGB border to be built differently, giving a different ROM hash and technically failing the test script. This patches libbet to only keep the known-good colors. It also adapts the coverage script to run all the tests, including building the third-party projects.
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
diff --git a/makefile b/makefile
|
|
index 6513518..ba14638 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
|
|
|
|
@@ -108,7 +108,7 @@ obj/gb/sgb.o: \
|
|
|
|
# Local variable allocation
|
|
|
|
-obj/gb/localvars.z80: tools/savescan.py $(wildcard src/*.z80)
|
|
+obj/gb/localvars.z80: tools/savescan.py $(sort $(wildcard src/*.z80))
|
|
$(PY) $^ -o $@
|
|
|
|
# Graphics conversion
|
|
diff --git a/tools/makeborder.py b/tools/makeborder.py
|
|
index b9fa3f1..dfe5789 100755
|
|
--- a/tools/makeborder.py
|
|
+++ b/tools/makeborder.py
|
|
@@ -88,7 +88,7 @@ def main(argv=None):
|
|
else:
|
|
iutmrows = b''.join(pb16.pb16(b''.join(utmrows)))
|
|
|
|
- palette = im.getpalette()[:48]
|
|
+ palette = im.getpalette()[:12]
|
|
palette.extend(bytes(48 - len(palette)))
|
|
snespalette = bytearray()
|
|
for i in range(0, 48, 3):
|