From ccdc106333cb669ffa09779a94cc0646ccaea08e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 8 Sep 2016 14:05:20 -0700 Subject: Convert .aif files to .pcm samples, and update Makefile to use aif2pcm tool. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e190356c9..d838fcbe2 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,8 @@ SHA1 := sha1sum -c GFX := @tools/gbagfx/gbagfx +AIF := @tools/aif2pcm/aif2pcm + SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc @@ -29,7 +31,7 @@ PREPROC := tools/preproc/preproc # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl +.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm .PHONY: all clean compare ruby sapphire @@ -81,12 +83,14 @@ include misc.mk %.bin: ; %.png: ; %.pal: ; +%.aif: ; %.1bpp: %.png ; $(GFX) $< $@ %.4bpp: %.png ; $(GFX) $< $@ %.8bpp: %.png ; $(GFX) $< $@ %.gbapal: %.pal ; $(GFX) $< $@ %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ +%.pcm: %.aif ; $(AIF) $< $@ src/libc_ruby.o src/libc_sapphire.o: CC1 := tools/agbcc/bin/old_agbcc src/libc_ruby.o src/libc_sapphire.o: CFLAGS := -O2 -- cgit v1.2.3 From 001e1c77b8e6afd6d0af0ec81496d54219e4c7bd Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 8 Sep 2016 16:42:47 -0700 Subject: Output .bin file for direct sound metadata (loop point, pitch adust, and number of samples). This was needed since we couldn't incbin a string argument in a macro. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d838fcbe2..3f11e0246 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ PREPROC := tools/preproc/preproc # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm +.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin .PHONY: all clean compare ruby sapphire @@ -91,6 +91,7 @@ include misc.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ %.pcm: %.aif ; $(AIF) $< $@ +%.bin: %.aif ; $(AIF) $< $@ src/libc_ruby.o src/libc_sapphire.o: CC1 := tools/agbcc/bin/old_agbcc src/libc_ruby.o src/libc_sapphire.o: CFLAGS := -O2 -- cgit v1.2.3 From 9bc34addc5bc5b7820095f4cadad21e0c25c6404 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 8 Sep 2016 16:54:45 -0700 Subject: Add .aif collateral files to Makefile's clean target. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3f11e0246..94a709b34 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ compare: both clean: rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i) pokeruby.map pokesapphire.map + rm -f data/music/direct_sound_samples/*.pcm data/music/direct_sound_samples/*.bin find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + tidy: -- cgit v1.2.3 From b96fa854e1845deb52a7918395ac337fc8b69560 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 8 Sep 2016 17:57:29 -0700 Subject: Use .aif files for programmable wave instruments. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 94a709b34..4b205c7dc 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ compare: both clean: rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i) pokeruby.map pokesapphire.map - rm -f data/music/direct_sound_samples/*.pcm data/music/direct_sound_samples/*.bin + rm -f data/music/direct_sound_samples/**/*.pcm data/music/**/*.bin find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + tidy: -- cgit v1.2.3 From f5d9daeca38728f67db92a175c37e5a3bc18cee3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 8 Sep 2016 18:31:25 -0700 Subject: Cleanup after all .aif-related collateral. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4b205c7dc..e3ccb6cfa 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ compare: both clean: rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i) pokeruby.map pokesapphire.map - rm -f data/music/direct_sound_samples/**/*.pcm data/music/**/*.bin + rm -f data/music/programmable_wave_samples/*.bin data/music/direct_sound_samples/*.bin data/music/**/*.pcm find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + tidy: -- cgit v1.2.3 From 7e3abfac163159c5b2f9b8bb246f7ac3085c9beb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 10 Sep 2016 11:20:50 -0700 Subject: Update 'make clean' directories. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bfca639b3..ab535acec 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ compare: both clean: rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i) pokeruby.map pokesapphire.map - rm -f data/music/programmable_wave_samples/*.bin data/music/direct_sound_samples/*.bin data/music/**/*.pcm + rm -f sound/programmable_wave_samples/*.bin sound/direct_sound_samples/*.bin sound/**/*.pcm find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + tidy: -- cgit v1.2.3