From 291ac2cee9b04c6a9b203867bbcf9df0176ef0e2 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sat, 8 Sep 2018 00:28:32 +0100 Subject: Add build rules for overworld sprite sheets --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ce3a6ec18..3c2c333b0 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,7 @@ tidy: rm -r build/* include graphics_file_rules.mk +include event_obj_graphics_makefile_rules.mk %.s: ; %.png: ; -- cgit v1.2.3 From aa0782c40bc5ace54447c8234a8ca8a08ee6d788 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 10 Sep 2018 12:03:24 -0500 Subject: Make gbafix silent --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3c2c333b0..47bfee2a2 100644 --- a/Makefile +++ b/Makefile @@ -173,5 +173,5 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ - $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) + $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) -silent -- cgit v1.2.3 From 8026188e36cfa33a420c0c2516cfa7816a61de5d Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 10 Sep 2018 13:15:53 -0500 Subject: Make long param use two dashes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 47bfee2a2..9adacb6e1 100644 --- a/Makefile +++ b/Makefile @@ -173,5 +173,5 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ - $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) -silent + $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent -- cgit v1.2.3 From ba125b23fd7a51675c27d5d23e8037e7c9dfdeb7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 11 Sep 2018 17:18:10 -0500 Subject: Remove transparency from event object spritesheets --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 47bfee2a2..a0ce6bdd1 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ tidy: rm -r build/* include graphics_file_rules.mk -include event_obj_graphics_makefile_rules.mk +include spritesheet_rules.mk %.s: ; %.png: ; -- cgit v1.2.3 From a63f3ce8722ba2bf39344c1aa83d141e8f3ddf09 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 22 Sep 2018 19:56:17 -0500 Subject: Set up Makefile for MIDIs --- Makefile | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d9f3ec4c7..a088f8541 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,12 @@ include $(DEVKITARM)/base_tools export CPP := $(PREFIX)cpp export LD := $(PREFIX)ld +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + TITLE := POKEMON EMER GAME_CODE := BPEE MAKER_CODE := 01 @@ -19,15 +25,17 @@ C_SUBDIR = src ASM_SUBDIR = asm DATA_ASM_SUBDIR = data SONG_SUBDIR = sound/songs +MID_SUBDIR = sound/songs/midi C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR) +MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR) ASFLAGS := -mcpu=arm7tdmi -CC1 := tools/agbcc/bin/agbcc +CC1 := tools/agbcc/bin/agbcc$(EXE) override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -nostdinc -undef @@ -37,13 +45,13 @@ LDFLAGS = -Map ../../$(MAP) LIB := -L ../../tools/agbcc/lib -lgcc -lc SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c -GFX := tools/gbagfx/gbagfx -AIF := tools/aif2pcm/aif2pcm -MID := $(abspath tools/mid2agb/mid2agb) -SCANINC := tools/scaninc/scaninc -PREPROC := tools/preproc/preproc -RAMSCRGEN := tools/ramscrgen/ramscrgen -FIX := tools/gbafix/gbafix +GFX := tools/gbagfx/gbagfx$(EXE) +AIF := tools/aif2pcm/aif2pcm$(EXE) +MID := $(abspath tools/mid2agb/mid2agb)$(EXE) +SCANINC := tools/scaninc/scaninc$(EXE) +PREPROC := tools/preproc/preproc$(EXE) +RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) +FIX := tools/gbafix/gbafix$(EXE) # Clear the default suffixes .SUFFIXES: @@ -57,7 +65,7 @@ FIX := tools/gbafix/gbafix .PHONY: rom clean compare tidy -$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR)) +$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR) $(MID_BUILDDIR)) C_SRCS := $(wildcard $(C_SUBDIR)/*.c) C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) @@ -71,7 +79,10 @@ DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DA SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s) SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS)) -OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) +MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid) +MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS)) + +OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS) OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) rom: $(ROM) @@ -82,7 +93,7 @@ compare: $(ROM) clean: tidy rm -f sound/direct_sound_samples/*.bin - rm -f $(SONG_OBJS) + rm -f $(SONG_OBJS) $(MID_OBJS) 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: @@ -91,6 +102,7 @@ tidy: include graphics_file_rules.mk include spritesheet_rules.mk +include songs.mk %.s: ; %.png: ; @@ -106,8 +118,6 @@ include spritesheet_rules.mk %.rl: % ; $(GFX) $< $@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress sound/%.bin: sound/%.aif ; $(AIF) $< $@ -sound/songs/%.s: sound/songs/%.mid - cd $(@D) && ../../$(MID) $( Date: Sun, 23 Sep 2018 23:52:04 -0500 Subject: Clean .s files in midi folder --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a088f8541..910e90328 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ compare: $(ROM) clean: tidy rm -f sound/direct_sound_samples/*.bin - rm -f $(SONG_OBJS) $(MID_OBJS) + rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s 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: -- cgit v1.2.3 From ec5360364bebe15ddc72bcea61aa097eff58cfa0 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 3 Oct 2018 23:09:03 -0500 Subject: Use relative path for mid2agb --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 910e90328..1d2a15d00 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ LIB := -L ../../tools/agbcc/lib -lgcc -lc SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c GFX := tools/gbagfx/gbagfx$(EXE) AIF := tools/aif2pcm/aif2pcm$(EXE) -MID := $(abspath tools/mid2agb/mid2agb)$(EXE) +MID := tools/mid2agb/mid2agb$(EXE) SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) -- cgit v1.2.3