diff options
| author | Revo <projectrevotpp@hotmail.com> | 2020-04-30 19:43:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 19:43:15 -0400 |
| commit | 2ac877a24f241d3bc9d875a1338c40d7325929c6 (patch) | |
| tree | ea91f20d1cd1ab5ae06880d1dd2e5a2c61f4db59 /Makefile | |
| parent | 67560155c2204ec8b4a01b57d73a641fc15254d3 (diff) | |
| parent | 16739b91a8f633a56552b90a70f4d7325c3d8dff (diff) | |
Merge pull request #46 from red031000/os_lib
sync os_lib with master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -54,8 +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 -ARM7BIN := arm7/build/arm7.bin +ARM9BIN := arm9/build/arm9.sbin +ARM7BIN := arm7/build/arm7.sbin ##################### Compiler Options ####################### @@ -94,7 +94,7 @@ JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q -TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm,$(wildcard $(TOOLS_DIR)/*)) +TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%) TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) @@ -161,7 +161,10 @@ $(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) $(ARM7BIN) - $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(ARM9BIN) $(ARM7BIN) + # Hack because mwldarm doesn't like the sbin suffix + cp $(ARM7BIN) $(BUILD_DIR)/arm7.bin + cp $(ARM9BIN) $(BUILD_DIR)/arm9.bin + $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(BUILD_DIR)/arm7.bin $(BUILD_DIR)/arm9.bin $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill=0xFF --pad-to=0x04000000 $< $@ |