collect_rings: use wave samples from main game

This commit is contained in:
Oliver Bell committed 2025-06-18 16:58:13 +01:00
1 parent 06d724592a
commit fe92fe5941
11 files changed
+9 -4

No files matched your search

+1
View File
@@ -1,3 +1,4 @@
graphics/*.pal
src/sa2
sound/songs/midi
sound/programmable_wave_samples
+8 -1
View File
@@ -90,6 +90,9 @@ SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
SOUND_ASM_SUBDIR = sound
SOUND_ASM_BUILDDIR = $(OBJ_DIR)/$(SOUND_ASM_SUBDIR)
SAMPLE_SUBDIR = sound/direct_sound_samples
WAVE_SAMPLES_SUBDIR = sound/programmable_wave_samples
C_SUBDIR = src
C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
@@ -252,7 +255,7 @@ compare: $(ROM)
$(SHA1) $(BUILD_NAME).sha1
clean: tidy
$(RM) -r $(SAMPLE_SUBDIR)/*.bin $(MID_SUBDIR)
$(RM) -r $(SAMPLE_SUBDIR)/*.bin $(MID_SUBDIR) $(WAVE_SAMPLES_SUBDIR)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -iname 'graphics/*.pal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec $(RM) {} +
@$(MAKE) clean -C ../../../libagbsyscall
@@ -294,6 +297,10 @@ $(MID_SUBDIR)/%.mid: ../../../sound/songs/midi/%.mid
$(shell mkdir -p $(shell dirname '$@'))
cp $< $@
$(WAVE_SAMPLES_SUBDIR)/%.pcm: ../../../$(WAVE_SAMPLES_SUBDIR)/%.pcm
$(shell mkdir -p $(shell dirname '$@'))
cp $< $@
# Build C and ASM sources from SA2
$(C_BUILDDIR)/sa2/%.o: $(C_BUILDDIR)/sa2/%.c
@echo "$(CC1) <flags> -o $@ $<"
@@ -1 +0,0 @@
#Eg‰«ÍďţÜş�vT2
@@ -1 +0,0 @@
�ワコ刪��wwwfT2
@@ -1 +0,0 @@
��シャィ@GV�゙