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 /arm7 | |
| parent | 5ee0d715d5e030f74d159c6bcee33c4ec416e8be (diff) | |
| parent | 48f301e353a728c328f6406a8c18f1da8d9de331 (diff) | |
Merge branch 'master' into extract_trainer_backsprites
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 |