From 97c6201cfe57470cfb7f4d00961ec2247573eda8 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 9 Oct 2017 02:19:44 -0400 Subject: [PATCH 1/3] add build/ support. --- .gitignore | 1 + Makefile | 81 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index e1600820c6..9f10eb5b13 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,6 @@ tools/* *.dump *.sa* Thumbs.db +build/ .DS_Store *.ddump diff --git a/Makefile b/Makefile index e176b12582..dd1a96ebbc 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef LD := $(DEVKITARM)/bin/arm-none-eabi-ld -LDFLAGS := -T ld_script.ld -Map pokeemerald.map +LDFLAGS := -T ld_script.ld -Map ../../pokeemerald.map OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy @@ -35,17 +35,22 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen .PHONY: rom clean compare tidy + +$(shell mkdir -p build/ build/emerald/{,asm,data,src}) + C_SRCS := $(wildcard src/*.c) -C_OBJS := $(C_SRCS:%.c=%.o) +C_OBJS := $(C_SRCS:%.c=build/emerald/%.o) ASM_SRCS := $(wildcard asm/*.s) -ASM_OBJS := $(ASM_SRCS:%.s=%.o) +ASM_OBJS := $(ASM_SRCS:%.s=build/emerald/%.o) DATA_ASM_SRCS := $(wildcard data/*.s) -DATA_ASM_OBJS := $(DATA_ASM_SRCS:%.s=%.o) +DATA_ASM_OBJS := $(DATA_ASM_SRCS:%.s=build/emerald/%.o) OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) +$OBJS_REL := $(OBJS:build/emerald/%=%) + ROM := pokeemerald.gba ELF := $(ROM:.gba=.elf) @@ -59,8 +64,10 @@ clean: tidy 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 {} + tidy: - rm -f ld_script.ld sym_bss.ld sym_common.ld sym_ewram.ld - rm -f $(ROM) $(ELF) $(OBJS) $(C_SRCS:%.c=%.i) pokeemerald.map + rm -f pokeemerald.gba + rm -f pokeemerald.map + rm -f pokeemerald.elf + rm -r build/* include graphics_file_rules.mk @@ -75,56 +82,58 @@ include graphics_file_rules.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ -src/libc.o: CC1 := tools/agbcc/bin/old_agbcc -src/libc.o: CFLAGS := -O2 +%src/libc.o: CC1 := tools/agbcc/bin/old_agbcc +%src/libc.o: CFLAGS := -O2 -src/siirtc.o: CFLAGS := -mthumb-interwork +%src/siirtc.o: CFLAGS := -mthumb-interwork -src/agb_flash.o: CFLAGS := -O -mthumb-interwork -src/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork -src/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork +%src/agb_flash.o: CFLAGS := -O -mthumb-interwork +%src/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork +%src/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork -src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc -src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc +%src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc +%src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc ifeq ($(NODEP),) -%.o: c_dep = $(shell $(SCANINC) $*.c) +build/emerald/src/%.o: c_dep = $(shell $(SCANINC) src/$(*F).c) else -%.o: c_dep := +build/emerald/src/%.o: c_dep := endif -$(C_OBJS): %.o : %.c $$(c_dep) - @$(CPP) $(CPPFLAGS) $< -o $*.i - @$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s - @echo -e ".text\n\t.align\t2, 0\n" >> $*.s - $(AS) $(ASFLAGS) -o $@ $*.s +build/emerald/%.o : %.c $$(c_dep) + @$(CPP) $(CPPFLAGS) $< -o build/emerald/$*.i + @$(PREPROC) build/emerald/$*.i charmap.txt | $(CC1) $(CFLAGS) -o build/emerald/$*.s + @echo -e ".text\n\t.align\t2, 0\n" >> build/emerald/$*.s + $(AS) $(ASFLAGS) -o $@ build/emerald/$*.s ifeq ($(NODEP),) -%.o: asm_dep = $(shell $(SCANINC) $*.s) +build/emerald/asm/%.o: asm_dep = $(shell $(SCANINC) asm/$(*F).s) +build/emerald/data/%.o: asm_dep = $(shell $(SCANINC) data/$(*F).s) else -%.o: asm_dep := +build/emerald/asm/%.o: asm_dep := +build/emerald/data/%.o: asm_dep := endif -$(ASM_OBJS): %.o: %.s $$(asm_dep) +build/emerald/asm/%.o: asm/%.s $$(asm_dep) $(AS) $(ASFLAGS) -o $@ $< -$(DATA_ASM_OBJS): %.o: %.s $$(asm_dep) +build/emerald/data/%.o: data/%.s $$(asm_dep) $(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@ -sym_bss.ld: sym_bss.txt - $(RAMSCRGEN) .bss sym_bss.txt ENGLISH >$@ +build/emerald/sym_bss.ld: sym_bss.txt + cd build/emerald && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt ENGLISH >sym_bss.ld -sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) - $(RAMSCRGEN) COMMON sym_common.txt ENGLISH -c src,common_syms >$@ +build/emerald/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) + cd build/emerald && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt ENGLISH -c src,../../common_syms >sym_common.ld -sym_ewram.ld: sym_ewram.txt - $(RAMSCRGEN) ewram_data sym_ewram.txt ENGLISH >$@ +build/emerald/sym_ewram.ld: sym_ewram.txt + cd build/emerald && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt ENGLISH >sym_ewram.ld -ld_script.ld: ld_script.txt sym_bss.ld sym_common.ld sym_ewram.ld - sed -f ld_script.sed ld_script.txt >ld_script.ld +build/emerald/ld_script.ld: ld_script.txt build/emerald/sym_bss.ld build/emerald/sym_common.ld build/emerald/sym_ewram.ld + cd build/emerald && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" >ld_script.ld -$(ELF): ld_script.ld $(OBJS) - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBGCC) +pokeemerald.elf: build/emerald/ld_script.ld $(OBJS) + cd build/emerald && $(LD) $(LDFLAGS) -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) -$(ROM): $(ELF) +pokeemerald.gba: %.gba: %.elf $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ From 6d66081be0b1b26ce55a6f1a2a20644e2ae5c7f7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 9 Oct 2017 20:25:34 -0400 Subject: [PATCH 2/3] minor tweak to make tidy. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dd1a96ebbc..d10505145e 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,7 @@ clean: tidy 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 {} + tidy: - rm -f pokeemerald.gba - rm -f pokeemerald.map - rm -f pokeemerald.elf + rm -f pokeemerald.{gba,map,elf} rm -r build/* include graphics_file_rules.mk From 31eeff93197619c653d5e9da8ed131c0aa368a82 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 10 Oct 2017 21:28:32 -0500 Subject: [PATCH 3/3] Use less cd and more vars --- Makefile | 109 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index d10505145e..ca8348f68b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,19 @@ SHELL := /bin/bash -o pipefail +ROM := pokeemerald.gba +OBJ_DIR := build/emerald + +ELF = $(ROM:.gba=.elf) +MAP = $(ROM:.gba=.map) + +C_SUBDIR = src +ASM_SUBDIR = asm +DATA_ASM_SUBDIR = data + +C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) +ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) +DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) + AS := $(DEVKITARM)/bin/arm-none-eabi-as ASFLAGS := -mcpu=arm7tdmi @@ -10,7 +24,7 @@ CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef LD := $(DEVKITARM)/bin/arm-none-eabi-ld -LDFLAGS := -T ld_script.ld -Map ../../pokeemerald.map +LDFLAGS = -Map $(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy @@ -20,7 +34,7 @@ SHA1 := sha1sum -c GFX := tools/gbagfx/gbagfx AIF := tools/aif2pcm/aif2pcm -MID := tools/mid2agb/mid2agb +MID := $(abspath tools/mid2agb/mid2agb) SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc RAMSCRGEN := tools/ramscrgen/ramscrgen @@ -35,24 +49,19 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen .PHONY: rom clean compare tidy +$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR)) -$(shell mkdir -p build/ build/emerald/{,asm,data,src}) +C_SRCS := $(wildcard $(C_SUBDIR)/*.c) +C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) -C_SRCS := $(wildcard src/*.c) -C_OBJS := $(C_SRCS:%.c=build/emerald/%.o) +ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s) +ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS)) -ASM_SRCS := $(wildcard asm/*.s) -ASM_OBJS := $(ASM_SRCS:%.s=build/emerald/%.o) - -DATA_ASM_SRCS := $(wildcard data/*.s) -DATA_ASM_OBJS := $(DATA_ASM_SRCS:%.s=build/emerald/%.o) +DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s) +DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS)) OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) - -$OBJS_REL := $(OBJS:build/emerald/%=%) - -ROM := pokeemerald.gba -ELF := $(ROM:.gba=.elf) +OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) rom: $(ROM) @@ -64,7 +73,7 @@ clean: tidy 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 {} + tidy: - rm -f pokeemerald.{gba,map,elf} + rm -f $(ROM) $(ELF) $(MAP) rm -r build/* include graphics_file_rules.mk @@ -80,58 +89,62 @@ include graphics_file_rules.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ -%src/libc.o: CC1 := tools/agbcc/bin/old_agbcc -%src/libc.o: CFLAGS := -O2 +$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc +$(C_BUILDDIR)/libc.o: CFLAGS := -O2 -%src/siirtc.o: CFLAGS := -mthumb-interwork +$(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork -%src/agb_flash.o: CFLAGS := -O -mthumb-interwork -%src/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork -%src/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork +$(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork +$(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork +$(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork -%src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc -%src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc +$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc +$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc ifeq ($(NODEP),) -build/emerald/src/%.o: c_dep = $(shell $(SCANINC) src/$(*F).c) +$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) $(C_SUBDIR)/$*.c) else -build/emerald/src/%.o: c_dep := +$(C_BUILDDIR)/%.o: c_dep := endif -build/emerald/%.o : %.c $$(c_dep) - @$(CPP) $(CPPFLAGS) $< -o build/emerald/$*.i - @$(PREPROC) build/emerald/$*.i charmap.txt | $(CC1) $(CFLAGS) -o build/emerald/$*.s - @echo -e ".text\n\t.align\t2, 0\n" >> build/emerald/$*.s - $(AS) $(ASFLAGS) -o $@ build/emerald/$*.s +$(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 + $(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s ifeq ($(NODEP),) -build/emerald/asm/%.o: asm_dep = $(shell $(SCANINC) asm/$(*F).s) -build/emerald/data/%.o: asm_dep = $(shell $(SCANINC) data/$(*F).s) +$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s) else -build/emerald/asm/%.o: asm_dep := -build/emerald/data/%.o: asm_dep := +$(ASM_BUILDDIR)/%.o: asm_dep := endif -build/emerald/asm/%.o: asm/%.s $$(asm_dep) +$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep) $(AS) $(ASFLAGS) -o $@ $< -build/emerald/data/%.o: data/%.s $$(asm_dep) +ifeq ($(NODEP),) +$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s) +else +$(DATA_ASM_BUILDDIR)/%.o: data_dep := +endif + +$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) $(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@ -build/emerald/sym_bss.ld: sym_bss.txt - cd build/emerald && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt ENGLISH >sym_bss.ld +$(OBJ_DIR)/sym_bss.ld: sym_bss.txt + $(RAMSCRGEN) .bss $< ENGLISH > $@ -build/emerald/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) - cd build/emerald && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt ENGLISH -c src,../../common_syms >sym_common.ld +$(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) + $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ -build/emerald/sym_ewram.ld: sym_ewram.txt - cd build/emerald && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt ENGLISH >sym_ewram.ld +$(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt + $(RAMSCRGEN) ewram_data $< ENGLISH > $@ -build/emerald/ld_script.ld: ld_script.txt build/emerald/sym_bss.ld build/emerald/sym_common.ld build/emerald/sym_ewram.ld - cd build/emerald && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" >ld_script.ld +$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld + cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" > ld_script.ld -pokeemerald.elf: build/emerald/ld_script.ld $(OBJS) - cd build/emerald && $(LD) $(LDFLAGS) -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) +$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) -pokeemerald.gba: %.gba: %.elf +$(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@