diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-15 11:32:24 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-15 11:32:24 -0500 |
| commit | feeb96f20fc5195248b90bd09405f43eeb19b0a8 (patch) | |
| tree | dc81253cd74037272585cd927a8320cc51b847a8 /Makefile | |
| parent | 411f4852c60356c8595470e2d0873be2b4eebbe2 (diff) | |
Revert agbcc dependency to pret master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,9 +1,9 @@ +include $(DEVKITARM)/base_tools + COMPARE ?= 0 -AS := tools/binutils/bin/arm-none-eabi-as CPP := $(CC) -E -LD := tools/binutils/bin/arm-none-eabi-ld -OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy +LD := $(DEVKITARM)/bin/arm-none-eabi-ld include config.mk @@ -182,7 +182,7 @@ endif $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s - @echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s + @echo -e ".text\n\t.align\t2, 0 @ Don't pad with nop\n" >> $(C_BUILDDIR)/$*.s $(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s ifeq ($(NODEP),1) @@ -224,7 +224,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 ../../$@ $(LIB) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent $(ROM): $(ELF) |