From 4b97511982ecdecbac166218b86e786c5cb6718b Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 25 Apr 2020 21:00:56 -0400
Subject: Split arm9 compilation to subdir

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 763dd714..d5a3c410 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,8 @@ S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s))
 O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
            $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \
 
+ARM9BIN := arm9/build/arm9.bin
+
 ##################### Compiler Options #######################
 
 MWCCVERSION := 2.0/base
@@ -107,7 +109,7 @@ else
 NODEP := 1
 endif
 
-.PHONY: all clean mostlyclean tidy tools $(TOOLDIRS) patch_mwasmarm
+.PHONY: all clean mostlyclean tidy tools $(TOOLDIRS) patch_mwasmarm $(ARM9BIN)
 
 MAKEFLAGS += --no-print-directory
 
@@ -133,6 +135,9 @@ $(MWASMARM): patch_mwasmarm
 patch_mwasmarm:
 	$(MWASMARM_PATCHER) $(MWASMARM)
 
+$(ARM9BIN):
+	@$(MAKE) -C arm9
+
 ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS))
 
 $(BUILD_DIR)/%.o: %.c
@@ -144,8 +149,8 @@ $(BUILD_DIR)/%.o: %.s
 $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) undefined_syms.txt
 	$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
 
-$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT)
-	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES)
+$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(ARM9BIN)
+	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(ARM9BIN)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill=0xFF --pad-to=0x04000000 $< $@
-- 
cgit v1.2.3


From 409de04065549094cec4905209aaf90dd7e3060c Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 25 Apr 2020 21:07:47 -0400
Subject: Move arm7 build files to subdirectory

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d5a3c410..f67c4348 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
            $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \
 
 ARM9BIN := arm9/build/arm9.bin
+ARM7BIN := arm7/build/arm7.bin
 
 ##################### Compiler Options #######################
 
@@ -109,7 +110,7 @@ else
 NODEP := 1
 endif
 
-.PHONY: all clean mostlyclean tidy tools $(TOOLDIRS) patch_mwasmarm $(ARM9BIN)
+.PHONY: all clean mostlyclean tidy tools $(TOOLDIRS) patch_mwasmarm $(ARM9BIN) $(ARM7BIN)
 
 MAKEFLAGS += --no-print-directory
 
@@ -138,6 +139,9 @@ patch_mwasmarm:
 $(ARM9BIN):
 	@$(MAKE) -C arm9
 
+$(ARM7BIN):
+	@$(MAKE) -C arm7
+
 ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS))
 
 $(BUILD_DIR)/%.o: %.c
@@ -149,8 +153,8 @@ $(BUILD_DIR)/%.o: %.s
 $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) undefined_syms.txt
 	$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
 
-$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(ARM9BIN)
-	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(ARM9BIN)
+$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(ARM9BIN) $(ARM7BIN)
+	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(ARM9BIN) $(ARM7BIN)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill=0xFF --pad-to=0x04000000 $< $@
-- 
cgit v1.2.3


From fc0f4d2c89040c868df82d0da5bfdfc492ea05d4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 25 Apr 2020 21:30:25 -0400
Subject: No need for multiple copies of baserom.nds

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f67c4348..bfb5ed9e 100644
--- a/Makefile
+++ b/Makefile
@@ -118,12 +118,18 @@ all: $(ROM)
 	@$(SHA1SUM) -c $(TARGET).sha1
 
 clean: mostlyclean
+	make -C arm9 clean
+	make -C arm7 clean
 	make -C tools/mwasmarm_patcher clean
 
 mostlyclean: tidy
+	make -C arm9 mostlyclean
+	make -C arm7 mostlyclean
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} +
 
 tidy:
+	make -C arm9 tidy
+	make -C arm7 tidy
 	$(RM) -r $(BUILD_DIR)
 
 tools: $(TOOLDIRS)
-- 
cgit v1.2.3