X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=68b1f63e94e47ef3f705f2cf2eaf0a0d22afa947;hb=c220edbe4acfffc6feb29eea8b977506edac6d99;hp=3d0b9d4e4c4ad36a9f0d8f2fa0981bec4824423f;hpb=a709333bb82b222e25648f26eb7b76722c4acfcc;p=gbajam21

diff --git a/Makefile b/Makefile
index 3d0b9d4..68b1f63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
 src = $(wildcard src/*.c)
-ssrc = $(wildcard src/*.s)
-obj = $(src:.c=.o) $(ssrc:.s=.o) $(dataobj)
+ssrc = $(wildcard src/*.s) data/lut.s
+obj = $(src:.c=.o) $(ssrc:.s=.o)
 dep = $(src:.c=.d)
 name = gbajam21
 elf = $(name).elf
 bin = $(name).gba
 
+data = data/tuncross.raw data/tuncross.pal \
+	   data/spr_game.raw data/spr_game.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-
 
@@ -21,8 +24,8 @@ OBJDUMP = $(TCPREFIX)objdump
 EMU = vbam
 
 opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
-#dbg = -g
-inc = -I. -Ilibs/aas
+dbg = -g
+inc = -I. -Ilibs/maxmod
 
 CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc)
 ASFLAGS = -mthumb-interwork
@@ -38,16 +41,24 @@ $(bin): $(elf)
 	$(OBJCOPY) -O binary $(elf) $(bin)
 	gbafix -r0 $(bin)
 
-$(elf): $(obj) $(libs)
-	$(CC) -o $(elf) $(obj) -specs=gba.specs $(LDFLAGS)
+$(elf): data/snd.h $(obj) $(libs)
+	$(CC) -o $(elf) $(obj) -specs=gba.specs -Wl,-Map,link.map $(LDFLAGS)
 
 -include $(dep)
 
+src/data.o: src/data.s $(data)
+
 tools/pngdump/pngdump:
 	$(MAKE) -C tools/pngdump
 
-tools/conv2aas/conv2aas:
-	$(MAKE) -C tools/conv2aas
+tools/lutgen: tools/lutgen.c
+	cc -o $@ $< -lm
+
+tools/tungen: tools/tungen.c
+	cc -o $@ -O3 -fopenmp $< -lm -lgomp -lpthread
+
+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 $^
@@ -58,10 +69,16 @@ tools/conv2aas/conv2aas:
 %.pal: %.png tools/pngdump/pngdump
 	tools/pngdump/pngdump -o $@ -c $<
 
-data/aas_data.h: data/aas_data.s
+data/lut.s: tools/lutgen
+	tools/lutgen >$@
 
-data/aas_data.s: $(audata) tools/conv2aas/conv2aas
-	tools/conv2aas/conv2aas data/audio
+data/tun.map: tools/tungen
+	tools/tungen -s 240x160 -y -c 400 -n 32 >$@
+
+data/snd.bin: $(audata) tools/mmutil/mmutil
+	tools/mmutil/mmutil -o$@ -hdata/snd.h $(audata)
+
+data/snd.h: data/snd.bin
 
 .PHONY: clean
 clean:
@@ -73,7 +90,7 @@ cleandep:
 
 .PHONY: cleanlibs
 cleanlibs:
-	$(MAKE) -C libs/aas clean
+	$(MAKE) -C libs/maxmod clean
 
 .PHONY: install
 install: $(bin)
@@ -85,7 +102,12 @@ run: $(bin_mb)
 
 .PHONY: simrun
 simrun: $(bin)
-	$(EMU) $(EMUFLAGS) $(bin)
+	mgba -2 $(bin)
+
+.PHONY: debug
+debug: $(elf)
+	mgba -2 -g $(bin) &
+	$(TCPREFIX)gdb $<
 
 .PHONY: disasm
 disasm: $(elf)
@@ -94,5 +116,5 @@ disasm: $(elf)
 .PHONY: libs
 libs: $(libs)
 
-libs/aas/libaas.a:
-	$(MAKE) -C libs/aas
+libs/maxmod/libmm.a:
+	$(MAKE) -C libs/maxmod