From a6b5d09ddfa6bd047848e023d50124e4aff86e5e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Nov 2018 18:28:24 -0500 Subject: More changes for modern gcc compat --- Makefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0b83cb5c5..b5429de2c 100644 --- a/Makefile +++ b/Makefile @@ -108,11 +108,6 @@ sound/%.bin: sound/%.aif ; $(AIF) $< $@ sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $( Date: Thu, 29 Nov 2018 09:54:26 -0500 Subject: through sub_81438F0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4e81222f4..9f8b13141 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,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) $(LIB) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ -- cgit v1.2.3 From f91b71d3955e5df5455ec7a302b45c7f174100bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Dec 2018 20:17:31 -0500 Subject: Port over berry fix program --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9f8b13141..431475026 100644 --- a/Makefile +++ b/Makefile @@ -84,10 +84,12 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + @$(MAKE) -C berry_fix clean tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* + @$(MAKE) -C berry_fix tidy include graphics_file_rules.mk @@ -169,3 +171,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent + +berry_fix/berry_fix.gba: + @$(MAKE) -C berry_fix -- cgit v1.2.3 From 2761c0f0a5a0411020bd9853329d402b663121cd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Dec 2018 15:43:45 -0500 Subject: Drop devkitARM dependency entirely --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 431475026..a2059db74 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +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 TITLE := POKEMON FIRE GAME_CODE := BPRE @@ -166,7 +167,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) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ -- cgit v1.2.3