From b133ba8cebc5c5dcd6a3aa4b427b65ab438811bb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 11:16:40 -0400 Subject: Fix symbols.csv for mac --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 63b46934..63a5a1a7 100644 --- a/Makefile +++ b/Makefile @@ -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) @@ -333,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 ### -- cgit v1.2.3