From 4e6adcddff69fd53ce342ead502a0699cd5f75ba Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 5 Jul 2020 14:11:39 -0400 Subject: Use SHA-1, not MD5, for 'make compare' Fixes #183 --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3e2a6e89..b2ab9f35 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,11 @@ pokeblue_obj := $(rom_obj:.o=_blue.o) ### Build tools -MD5 := md5sum -c +ifeq (,$(shell which sha1sum)) +SHA1 := shasum +else +SHA1 := sha1sum +endif RGBDS ?= RGBASM ?= $(RGBDS)rgbasm @@ -47,9 +51,8 @@ tidy: rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o $(MAKE) clean -C tools/ -# For contributors to make sure a change didn't affect the original contents of the ROMs. compare: $(roms) - @$(MD5) roms.md5 + @$(SHA1) -c roms.sha1 tools: $(MAKE) -C tools/ -- cgit v1.3.1-sl0p From d6820cdcbfe48adb3ef7935b84c21fcb7796e701 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 5 Jul 2020 14:15:49 -0400 Subject: File-specific graphics rules update rgbgfx (flags only), not RGBGFX (program path), like pokecrystal Fixes #227 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b2ab9f35..301e2035 100644 --- a/Makefile +++ b/Makefile @@ -106,12 +106,12 @@ pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace -gfx/intro_credits/blue_jigglypuff_1.2bpp: $(RGBGFX) += -h -gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h -gfx/intro_credits/blue_jigglypuff_3.2bpp: $(RGBGFX) += -h -gfx/intro_credits/red_nidorino_1.2bpp: $(RGBGFX) += -h -gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h -gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h +gfx/intro_credits/blue_jigglypuff_1.2bpp: rgbgfx += -h +gfx/intro_credits/blue_jigglypuff_2.2bpp: rgbgfx += -h +gfx/intro_credits/blue_jigglypuff_3.2bpp: rgbgfx += -h +gfx/intro_credits/red_nidorino_1.2bpp: rgbgfx += -h +gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h +gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$< @@ -134,7 +134,7 @@ gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates tools/gfx $(tools/gfx) -o $@ $@) %.1bpp: %.png - $(RGBGFX) -d1 $(rgbgfx) -o $@ $< + $(RGBGFX) $(rgbgfx) -d1 -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) -- cgit v1.3.1-sl0p