diff options
| author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:49 -0500 |
|---|---|---|
| committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:49 -0500 |
| commit | 26624e24143f24dcc342e78dd1aaaf1a068e4c9e (patch) | |
| tree | fcf30dfee0451784d2a0ac2485f05587e98d83f4 /Makefile | |
| parent | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (diff) | |
| parent | eec225e983a62ff2241f84ae7077650233a197c8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -30,8 +30,7 @@ LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy -LIBGCC := tools/agbcc/lib/libgcc.a -LIBC := tools/agbcc/lib/libc.a +LIB := -L ../../tools/agbcc/lib -lgcc -lc SHA1 := sha1sum -c @@ -163,7 +162,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ |