X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=a83188ff16f306cfac9d3ea5ba04dae5a70e7e47;hb=622fc6ef720a41a066e1bfcbdc6e003609da2da7;hp=bf91267940dd22e0498555ef7d94882be306b33c;hpb=9e57d947e341a9e2ccfe3726d1f894ad021ff46f;p=gbajam21

diff --git a/Makefile b/Makefile
index bf91267..a83188f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 src = $(wildcard src/*.c)
 ssrc = $(wildcard src/*.s)
-obj = $(src:.c=.o) $(ssrc:.s=.o) $(dataobj)
+obj = $(src:.c=.o) $(ssrc:.s=.o)
 dep = $(src:.c=.d)
 name = gbajam21
 elf = $(name).elf
@@ -10,9 +10,8 @@ data = data/tuncross.raw data/tuncross.pal \
 	   data/tun.map
 
 audata = data/audio/popcorn.mod
-dataobj = data/aas_data.o
 
-libs = libs/aas/libaas.a
+libs = libs/maxmod/libmm.a
 
 TCPREFIX = arm-none-eabi-
 
@@ -25,7 +24,7 @@ EMU = vbam
 
 opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
 dbg = -g
-inc = -I. -Ilibs/aas
+inc = -I. -Ilibs/maxmod
 
 CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc)
 ASFLAGS = -mthumb-interwork
@@ -41,7 +40,7 @@ $(bin): $(elf)
 	$(OBJCOPY) -O binary $(elf) $(bin)
 	gbafix -r0 $(bin)
 
-$(elf): data/aas_data.h $(obj) $(libs)
+$(elf): data/snd.h $(obj) $(libs)
 	$(CC) -o $(elf) $(obj) -specs=gba.specs $(LDFLAGS)
 
 -include $(dep)
@@ -51,12 +50,12 @@ src/data.o: src/data.s $(data)
 tools/pngdump/pngdump:
 	$(MAKE) -C tools/pngdump
 
-tools/conv2aas/conv2aas:
-	$(MAKE) -C tools/conv2aas
-
 tools/tungen: tools/tungen.c
 	cc -o $@ $< -lm
 
+tools/mmutil/mmutil:
+	$(MAKE) -C tools/mmutil
+
 #data/sprites.raw: data/sprites1.png data/sprites2.png data/sprites3.png data/sprites4.png data/sprites5.png data/sprites6.png
 #	tools/pngdump/pngdump -o $@ -n $^
 
@@ -69,10 +68,10 @@ tools/tungen: tools/tungen.c
 data/tun.map: tools/tungen
 	tools/tungen -s 240x160 >$@
 
-data/aas_data.h: data/aas_data.s
+data/snd.bin: $(audata) tools/mmutil/mmutil
+	tools/mmutil/mmutil -o$@ -hdata/snd.h $(audata)
 
-data/aas_data.s: $(audata) tools/conv2aas/conv2aas
-	tools/conv2aas/conv2aas data/audio
+data/snd.h: data/snd.bin
 
 .PHONY: clean
 clean:
@@ -84,7 +83,7 @@ cleandep:
 
 .PHONY: cleanlibs
 cleanlibs:
-	$(MAKE) -C libs/aas clean
+	$(MAKE) -C libs/maxmod clean
 
 .PHONY: install
 install: $(bin)
@@ -110,5 +109,5 @@ disasm: $(elf)
 .PHONY: libs
 libs: $(libs)
 
-libs/aas/libaas.a:
-	$(MAKE) -C libs/aas
+libs/maxmod/libmm.a:
+	$(MAKE) -C libs/maxmod