diff options
| author | red031000 <rubenru09@aol.com> | 2020-06-23 23:18:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 23:18:29 +0100 |
| commit | c82f923bb095740ec58c389deb08083dbeddc769 (patch) | |
| tree | 88f3668e52db0815504875cb1d08e78ef902a03b /Makefile | |
| parent | 64595272f97d0ada42b69e442c7f52766ed60d63 (diff) | |
| parent | 291f2d27d36b5c437c6c1908d5217bb954799402 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -303,10 +303,10 @@ arm7: $(MAKE) -C arm7 COMPARE=$(COMPARE) $(BINFILES): %.bin: %.sbin + @# Hack because mwldarm doesn't like the sbin suffix @cp $< $@ $(ELF): $(BUILD_DIR)/$(LD_SCRIPT) $(O_FILES) $(BINFILES) $(BUILD_DIR)/pokediamond_bnr.bin - # Hack because mwldarm doesn't like the sbin suffix $(LD) $(LDFLAGS) -o $@ $^ $(ROM): $(ELF) |