From 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 9 Jan 2018 15:53:17 -0500 Subject: Implement agbcc's libc and allow a custom cxx compiler to be passed to build_tools.sh --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 382b69888..32cacc1fc 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy LIBGCC := tools/agbcc/lib/libgcc.a +LIBC := tools/agbcc/lib/libc.a SHA1 := sha1sum -c @@ -154,7 +155,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) ../../$(LIBGCC) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ -- cgit v1.2.3 From 294c9656bec076e1993375966a725723a931fa33 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:30:08 -0500 Subject: fix broken build after building without tools --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a0f93e250..585236e75 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,10 @@ SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc RAMSCRGEN := tools/ramscrgen/ramscrgen -# Clear the default suffixes. +# Clear the default suffixes .SUFFIXES: +# Delete files that weren't built properly +.DELETE_ON_ERROR: # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -- cgit v1.2.3 From 98ee41806e87f5b1cd43bab4dff1466b65aa036c Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:30:43 -0500 Subject: use .SECONDARY instead of .PRECIOUS to prevent files from being deleted --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 585236e75..14768cd2f 100644 --- a/Makefile +++ b/Makefile @@ -45,14 +45,14 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen # Clear the default suffixes .SUFFIXES: +# Don't delete intermediate files +.SECONDARY: # Delete files that weren't built properly .DELETE_ON_ERROR: # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin - .PHONY: rom clean compare tidy $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR)) -- cgit v1.2.3 From 84d364819acb147ea7651ec3d890cd0b985e40be Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:31:07 -0500 Subject: add a rule for baserom.gba --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 14768cd2f..fa2acb282 100644 --- a/Makefile +++ b/Makefile @@ -168,3 +168,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ + +baserom.gba: ; + $(error baserom.gba is required to build) -- cgit v1.2.3 From fd267b2dc3f8634e7e3ca2fa88d8fa9be35103c7 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 17 Jan 2018 00:38:18 -0600 Subject: Remove duplicate LIBC line from makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 26993020d..8a7777270 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,6 @@ OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy LIBGCC := tools/agbcc/lib/libgcc.a LIBC := tools/agbcc/lib/libc.a -LIBC := tools/agbcc/lib/libc.a - SHA1 := sha1sum -c GFX := tools/gbagfx/gbagfx -- cgit v1.2.3 From 311a18ee9a811e4f380379ba750cd0887bbfd3a0 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Jan 2018 22:58:42 -0500 Subject: edit instructions and makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8a7777270..b9e2fb289 100644 --- a/Makefile +++ b/Makefile @@ -168,5 +168,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ -baserom.gba: ; - $(error baserom.gba is required to build) -- cgit v1.2.3 From 454e44aa435b02815fd708e9b0d39f9b74a7cde9 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 21 Jan 2018 12:37:17 -0500 Subject: Use standard flags to link libgcc, libc --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b9e2fb289..37344066e 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,7 @@ LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy -LIBGCC := tools/agbcc/lib/libgcc.a -LIBC := tools/agbcc/lib/libc.a +LIB := -L ../../tools/agbcc/lib -lgcc -lc SHA1 := sha1sum -c @@ -163,7 +162,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) ../../$(LIBGCC) ../../$(LIBC) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ -- cgit v1.2.3 From f57340b729d741acae17213c9c748738fcc1dcb3 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Jan 2018 15:50:12 -0600 Subject: Revert "Use standard flags to link libgcc, libc" This reverts commit 454e44aa435b02815fd708e9b0d39f9b74a7cde9. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 37344066e..b9e2fb289 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,8 @@ LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy -LIB := -L ../../tools/agbcc/lib -lgcc -lc +LIBGCC := tools/agbcc/lib/libgcc.a +LIBC := tools/agbcc/lib/libc.a SHA1 := sha1sum -c @@ -162,7 +163,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 ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ -- cgit v1.2.3