diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2021-11-24 11:13:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 11:13:36 -0500 |
| commit | a84ecb36410c266f7d4628b261904c2ef2e02d66 (patch) | |
| tree | 4a41590e86c0d22f80100fdb98ab1b2c33c9e306 /arm9 | |
| parent | 5ee0d715d5e030f74d159c6bcee33c4ec416e8be (diff) | |
| parent | 48f301e353a728c328f6406a8c18f1da8d9de331 (diff) | |
Merge branch 'master' into extract_trainer_backsprites
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 e3c573b7..b98cd0fa 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -224,7 +224,8 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(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) |