diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-25 21:07:47 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-25 21:07:47 -0400 |
| commit | 409de04065549094cec4905209aaf90dd7e3060c (patch) | |
| tree | 22d7ea8e8e6b6bc6c94454503f01929b29f16b80 /Makefile | |
| parent | 4b97511982ecdecbac166218b86e786c5cb6718b (diff) | |
Move arm7 build files to subdirectory
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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 $< $@ |