diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-11-06 17:54:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-11-06 17:54:08 -0400 |
| commit | 2e8f24c114893c871b6295f283d14b087e862b1a (patch) | |
| tree | ab56adaea3a1d2f67a78ecdc4af4805d6ad8d584 /arm7 | |
| parent | 344a645b5a977bc277b9eb8c0a03496047b01a49 (diff) | |
| parent | 48f301e353a728c328f6406a8c18f1da8d9de331 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'arm7')
| -rw-r--r-- | arm7/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arm7/Makefile b/arm7/Makefile index d142c079..67a07f26 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -180,7 +180,8 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE) $(MAKELSF) $< $(LD_TEMPLATE) $@ $(ROM): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BIN_FILES) - $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(BIN_FILES) + echo "$(O_FILES) $(BIN_FILES)" > $(ELF).objlist + $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) @$(ELF).objlist $(OBJCOPY) --update-section arm7=$@ -j arm7 $(foreach ov,$(OVERLAYS),--update-section $(ov)=$(BUILD_DIR)/$(ov).sbin -j $(ov)) $(ELF) 2>/dev/null # Make sure build directory exists before compiling anything |