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 /arm9 | |
| parent | 344a645b5a977bc277b9eb8c0a03496047b01a49 (diff) | |
| parent | 48f301e353a728c328f6406a8c18f1da8d9de331 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index 7fd14a1a..9529cc58 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -224,7 +224,8 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(BUILD_DIR)/$(LD_TEMPLATE) $(MAKELCF) $(MAKELCF_FLAGS) $^ $@ $(ROM): $(BUILD_DIR)/$(LD_SCRIPT) $(O_FILES) $(STATIC_LIBS) - cd $(BUILD_DIR) && LM_LICENSE_FILE=../../$(LM_LICENSE_FILE) $(WINE) ../../$(MWLDARM) $(LDFLAGS) $(LIBS) -o ../../$(ELF) $(LD_SCRIPT) $(O_FILES:$(BUILD_DIR)/%=%) + echo "$(O_FILES:$(BUILD_DIR)/%=%)" > $(ELF).objlist + cd $(BUILD_DIR) && LM_LICENSE_FILE=../../$(LM_LICENSE_FILE) $(WINE) ../../$(MWLDARM) $(LDFLAGS) $(LIBS) -o ../../$(ELF) $(LD_SCRIPT) @../../$(ELF).objlist $(OBJCOPY) $(foreach ov,arm9 $(OVERLAYS),--update-section $(ov)=$(BUILD_DIR)/$(ov).sbin -j $(ov)) $(ELF) 2>/dev/null ifeq ($(SHIFTED),0) |