From 106f42c70037c53f9317b87b660c79f8f1008549 Mon Sep 17 00:00:00 2001 From: d0k3 Date: Tue, 20 Mar 2018 00:56:37 +0100 Subject: [PATCH] Beautified Makefile output --- Makefile | 6 ++++-- arm11/Makefile | 13 +++++++++---- arm9/Makefile | 13 +++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d3a0769..e3436b3 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,9 @@ vram0: firm: $(ELF) vram0 @test `wc -c <$(VRAM_OUT)` -le 3145728 @mkdir -p $(call dirname,"$(FIRM)") $(call dirname,"$(FIRMD)") - firmtool build $(FIRM) $(FTFLAGS) -g -A 0x18000000 -D $(ELF) $(VRAM_OUT) -C NDMA XDMA memcpy - firmtool build $(FIRMD) $(FTDFLAGS) -g -A 0x18000000 -D $(ELF) $(VRAM_OUT) -C NDMA XDMA memcpy + @echo "[FIRM] $(FIRM)" + @firmtool build $(FIRM) $(FTFLAGS) -g -A 0x18000000 -D $(ELF) $(VRAM_OUT) -C NDMA XDMA memcpy + @echo "[FIRM] $(FIRMD)" + @firmtool build $(FIRMD) $(FTDFLAGS) -g -A 0x18000000 -D $(ELF) $(VRAM_OUT) -C NDMA XDMA memcpy .FORCE: diff --git a/arm11/Makefile b/arm11/Makefile index 38efe8b..774a9a2 100644 --- a/arm11/Makefile +++ b/arm11/Makefile @@ -1,9 +1,11 @@ +PROCESSOR := ARM11 + TARGET := $(shell basename $(CURDIR)) SOURCE := source BUILD := build -SUBARCH := -DARM11 -mcpu=mpcore -mtune=mpcore -mfloat-abi=soft -marm +SUBARCH := -D$(PROCESSOR) -mcpu=mpcore -mtune=mpcore -mfloat-abi=soft -marm INCDIRS := source INCLUDE := $(foreach dir,$(INCDIRS),-I"$(shell pwd)/$(dir)") @@ -26,12 +28,15 @@ clean: $(TARGET).elf: $(OBJECTS) @mkdir -p "$(@D)" - $(CC) $(LDFLAGS) $^ -o $@ + @echo "[$(PROCESSOR)] $<" + @$(CC) $(LDFLAGS) $^ -o $@ $(BUILD)/%.o: $(SOURCE)/%.c @mkdir -p "$(@D)" - $(CC) -c $(CFLAGS) -o $@ $< + @echo "[$(PROCESSOR)] $<" + @$(CC) -c $(CFLAGS) -o $@ $< $(BUILD)/%.o: $(SOURCE)/%.s @mkdir -p "$(@D)" - $(CC) -c $(ASFLAGS) -o $@ $< + @echo "[$(PROCESSOR)] $<" + @$(CC) -c $(ASFLAGS) -o $@ $< diff --git a/arm9/Makefile b/arm9/Makefile index dea7378..c95caef 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -1,9 +1,11 @@ +PROCESSOR := ARM9 + TARGET := $(shell basename $(CURDIR)) SOURCE := source BUILD := build -SUBARCH := -DARM9 -mcpu=arm946e-s -mtune=arm946e-s -mfloat-abi=soft -mthumb +SUBARCH := -D$(PROCESSOR) -mcpu=arm946e-s -mtune=arm946e-s -mfloat-abi=soft -mthumb INCDIRS := source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/quicklz source/qrcodegen source/system source/utils INCLUDE := $(foreach dir,$(INCDIRS),-I"$(shell pwd)/$(dir)") @@ -26,12 +28,15 @@ clean: $(TARGET).elf: $(OBJECTS) @mkdir -p "$(@D)" - $(CC) $(LDFLAGS) $^ -o $@ + @echo "[$(PROCESSOR)] $<" + @$(CC) $(LDFLAGS) $^ -o $@ $(BUILD)/%.o: $(SOURCE)/%.c @mkdir -p "$(@D)" - $(CC) -c $(CFLAGS) -o $@ $< + @echo "[$(PROCESSOR)] $<" + @$(CC) -c $(CFLAGS) -o $@ $< $(BUILD)/%.o: $(SOURCE)/%.s @mkdir -p "$(@D)" - $(CC) -c $(ASFLAGS) -o $@ $< + @echo "[$(PROCESSOR)] $<" + @$(CC) -c $(ASFLAGS) -o $@ $<