diff options
| author | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
|---|---|---|
| committer | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
| commit | abd2d1e16494867989e710e5235c6425fa4e8c34 (patch) | |
| tree | 7eff3e1db566801104a8fc2672bbe57e06f7009e /Makefile | |
| parent | 70556fc300ba85dad248d20b3c79c415e2ef88e5 (diff) | |
| parent | 12c17948602bf14535c91c530f214b99863e038e (diff) | |
conflicts
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -32,9 +32,19 @@ endif ifeq ($(OS),Windows_NT) EXE := .exe WINE := +GREP := grep -P +SED := sed -r else EXE := WINE := wine +UNAME_S := $(shell uname -s) +ifeq ($(UNAME_S),Darwin) +GREP := grep -E +SED := perl -p -e +else +GREP := grep -P +SED := sed -r +endif endif ifeq ($(NOWINE),1) @@ -191,7 +201,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o ASFLAGS = -proc arm5te -CFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/include -W all +CFLAGS = -O4,p -gccext,on -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -i include -ir include-mw -ir arm9/lib/include -W all LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start ####################### Other Tools ######################### @@ -199,7 +209,9 @@ LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start # DS TOOLS TOOLS_DIR = tools SHA1SUM = sha1sum +CSV2BIN = $(TOOLS_DIR)/csv2bin/csv2bin JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc +O2NARC = $(TOOLS_DIR)/o2narc/o2narc GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q MAKEBANNER = $(WINE) $(TOOLS_DIR)/bin/makebanner.exe @@ -242,12 +254,12 @@ clean: mostlyclean $(MAKE) -C arm7 clean $(MAKE) -C tools/mwasmarm_patcher clean $(RM) $(filter-out files/poketool/personal/pms.narc,$(filter %.narc %.arc,$(HOSTFS_FILES))) - $(MAKE) -C files/poketool/personal/growtbl clean mostlyclean: tidy $(MAKE) -C arm9 mostlyclean $(MAKE) -C arm7 mostlyclean find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} + + find files \( -name '*.c' -o -name '*.o' \) -exec $(RM) {} + tidy: $(MAKE) -C arm9 tidy @@ -331,7 +343,7 @@ $(BUILD_DIR)/pokediamond_bnr.bin: pokediamond.bsf graphics/icon.4bpp graphics/ic $(MAKEBANNER) $< $@ symbols.csv: arm9 arm7 - (echo "Name,Location"; grep -P " *[0-9A-F]{8} [0-9A-F]{8} \S+ +\w+\t\(\w+\.o\)" arm9/build/arm9.elf.xMAP arm7/build/arm7.elf.xMAP | sed -r 's/ *([0-9A-F]{8}) [0-9A-F]{8} \S+ +(\w+)\t\(\w+\.o\)/\2,\1/g' | cut -d: -f2) > $@ + (echo "Name,Location"; $(GREP) " *[0-9A-F]{8} [0-9A-F]{8} \S+ +\w+\t\(\w+\.o\)" arm9/build/arm9.elf.xMAP arm7/build/arm7.elf.xMAP | $(SED) 's/ *([0-9A-F]{8}) [0-9A-F]{8} \S+ +(\w+)\t\(\w+\.o\)/\2,\1/g' | cut -d: -f2) > $@ ### Debug Print ### |