diff options
Diffstat (limited to 'arm7/Makefile')
| -rw-r--r-- | arm7/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arm7/Makefile b/arm7/Makefile index c2e69fe2..cdbb27d7 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -39,9 +39,11 @@ BUILD_DIR := build TARGET := arm7 -ROM := $(BUILD_DIR)/$(TARGET).bin +ROM := $(BUILD_DIR)/$(TARGET).sbin ELF := $(BUILD_DIR)/$(TARGET).elf -LD_SCRIPT := arm7.lcf +LD_SCRIPT := $(TARGET).lcf +LD_SPEC := $(TARGET).lsf +LD_TEMPLATE := ARM7-TS.lcf.template # Directories containing source files SRC_DIRS := src @@ -69,6 +71,7 @@ MWCCARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwccarm.exe # only dependency should be MWCCARM. MWLDARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwldarm.exe MWASMARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwasmarm.exe +MAKELSF := $(WINE) $(TOOLS_DIR)/bin/makelcf.exe AS := $(WINE) $(MWASMARM) CC := $(WINE) $(MWCCARM) @@ -91,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)) @@ -141,15 +144,12 @@ $(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.o: %.s $(AS) $(ASFLAGS) $< -o $@ -$(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 $@ $< +$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE) + $(MAKELSF) $< $(LD_TEMPLATE) $@ -$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) +$(ROM): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) -$(ROM): $(ELF) - $(OBJCOPY) -O binary --gap-fill=0xFF $< $@ - # Make sure build directory exists before compiling anything DUMMY != mkdir -p $(ALL_DIRS) |