Sfoglia il codice sorgente

fix sampler makefile for autogen samples

Michael Panzlaff 6 anni fa
parent
commit
c15a4da8b6
1 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 4
    3
      assets/sound/Samples/Makefile

+ 4
- 3
assets/sound/Samples/Makefile Vedi File

@@ -2,7 +2,8 @@ AS = arm-none-eabi-as
2 2
 AR = arm-none-eabi-ar
3 3
 
4 4
 BIN_FILES = $(sort $(wildcard BIN/*.bin))
5
-OBJ_FILES = $(addprefix OBJ/,$(notdir $(BIN_FILES:.bin=.o)))
5
+WAV_FILES = $(sort $(wildcard WAV/*.wav))
6
+OBJ_FILES = $(addprefix OBJ/,$(notdir $(BIN_FILES:.bin=.o))) $(addprefix OBJ/,$(notdir $(WAV_FILES:.wav=.o)))
6 7
 
7 8
 S_DUMP_FILES = $(sort $(wildcard S_DUMP/*.s))
8 9
 OBJ_DUMP_FILES = $(addprefix OBJ_DUMP/,$(notdir $(S_DUMP_FILES:.s=.o)))
@@ -15,8 +16,8 @@ clean:
15 16
 	rm -f OBJ/*.o OBJ_DUMP/*.o sample.a S/*.s
16 17
 
17 18
 #.PRECIOUS: S/%.s
18
-S/%.s: BIN/%.bin
19
-	bin2asm $< > $@
19
+S/%.s: WAV/%.wav
20
+	wav2agb $< $@
20 21
 
21 22
 OBJ/%.o: S/%.s
22 23
 	$(AS) $< -o $@