From 898c863bd46ebc4fdca5329f1ebe64212b079630 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 3 Jun 2018 10:54:49 -0400
Subject: Suspend support for Silver and non-debug ROMs

---
 Makefile | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 688748f..e32a609 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include config.mk
 
 BUILDBASE := build
-BUILD := $(BUILDBASE)/$(BUILD_NAME)
+BUILD := $(BUILDBASE)
 
 MD5 := md5sum -c
 PYTHON := python
@@ -15,13 +15,15 @@ RGBFIX := rgbfix
 RGBASMFLAGS := -h -E -i $(BUILD)/
 tools/gfx :=
 tools/make_shim :=
+sort_sym := $(PYTHON3) tools/sort_sym.py
 
-ROM := poke$(BUILD_NAME)_spaceworld.gb
-ROMS := pokegold_spaceworld.gb pokesilver_spaceworld.gb pokegold_debug_spaceworld.gb pokesilver_debug_spaceworld.gb
-BASEROM := baserom_$(BUILD_NAME).gb
+ROM := poke$(BUILD_NAME)-spaceworld.gb
+ROMS := $(foreach r, gold gold_debug silver silver_debug, poke$(r)-spaceworld.gb)
+# Pokemon Gold Debug
+BASEROM := baserom.gb
 DIRS := home engine data audio
 OBJS := $(addprefix $(BUILD)/, gfx.o sram.o wram.o hram.o shim.o)
-SHIM := shim_$(BUILD_NAME).sym
+SHIM := shim.sym
 CORRECTEDROM := $(ROM:%.gb=%-correctheader.gb)
 CORRECTEDROMS := $(ROMS:%.gb=%-correctheader.gb)
 
@@ -38,7 +40,7 @@ GFX := $(patsubst %.png, $(BUILD)/%.2bpp, \
 .SECONDEXPANSION:
 
 .PHONY: all
-all: $(ROM) $(CORRECTEDROM) coverage
+all: $(ROM) $(CORRECTEDROM)
 .PHONY: tools
 tools tools/pkmncompress tools/gfx:
 	$(MAKE) -C tools/
@@ -46,7 +48,7 @@ tools tools/pkmncompress tools/gfx:
 # Remove files generated by the build process.
 .PHONY: clean
 clean:
-	rm -rf $(ROMS) $(BUILDBASE) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) $(CORRECTEDROMS)
+	rm -rf $(ROMS) $(CORRECTEDROMS) $(BUILDBASE) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) $(CORRECTEDROMS)
 	make -C tools clean
 
 # Remove files except for graphics.
@@ -58,10 +60,10 @@ mostlyclean:
 $(ROM): $(OBJS)
 	$(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^
 	$(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2$(GAME_VERSION)" $@
-	-$(PYTHON3) sort_sym.py $(@:.gb=.sym)
+	-$(sort_sym) $(@:.gb=.sym)
 
-$(BUILD)/shim.asm: $(SHIM) | $$(dir $$@)
-	tools/make_shim -w $< > $@
+$(BUILD)/shim.asm: tools/make_shim $(SHIM) tools/make_shim | $$(dir $$@)
+	tools/make_shim -w $(filter-out $<, $^) > $@
 $(CORRECTEDROM): %-correctheader.gb: %.gb
 	cp $< $@
 	$(RGBFIX) -f hg -m 0x10 $@
@@ -111,13 +113,13 @@ $(BUILD)/%.tilemap: %.png | $$(dir $$@)
 
 -include $(call rwildcard, $(BUILD)/, *.d)
 
-gold:         ; @$(MAKE) GAME_VERSION=GOLD
+#gold:         ; @$(MAKE) GAME_VERSION=GOLD
 gold_debug:   ; @$(MAKE) GAME_VERSION=GOLD DEBUG=1
-silver:       ; @$(MAKE) GAME_VERSION=SILVER
-silver_debug: ; @$(MAKE) GAME_VERSION=SILVER DEBUG=1
+#silver:       ; @$(MAKE) GAME_VERSION=SILVER
+#silver_debug: ; @$(MAKE) GAME_VERSION=SILVER DEBUG=1
 compare: ;
-	@$(MAKE) GAME_VERSION=GOLD COMPARE=1
+#	@$(MAKE) GAME_VERSION=GOLD COMPARE=1
 	@$(MAKE) GAME_VERSION=GOLD DEBUG=1 COMPARE=1
-	@$(MAKE) GAME_VERSION=SILVER COMPARE=1
-	@$(MAKE) GAME_VERSION=SILVER DEBUG=1 COMPARE=1
+#	@$(MAKE) GAME_VERSION=SILVER COMPARE=1
+#	@$(MAKE) GAME_VERSION=SILVER DEBUG=1 COMPARE=1
 	@$(MD5) roms.md5
-- 
cgit v1.2.3