pngdump fix: previous commit inadvertently made PNG output the default

[gbajam21] / Makefile

diff --git a/Makefile b/Makefile
index bf91267..68b1f63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +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-
 
@@ -25,7 +25,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,8 +41,8 @@ $(bin): $(elf)
        $(OBJCOPY) -O binary $(elf) $(bin)
        gbafix -r0 $(bin)
 
-$(elf): data/aas_data.h $(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)
 
@@ -51,11 +51,14 @@ 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 $@ $< -lm
+       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 $^
@@ -66,13 +69,16 @@ tools/tungen: tools/tungen.c
 %.pal: %.png tools/pngdump/pngdump
        tools/pngdump/pngdump -o $@ -c $<
 
+data/lut.s: tools/lutgen
+       tools/lutgen >$@
+
 data/tun.map: tools/tungen
-       tools/tungen -s 240x160 >$@
+       tools/tungen -s 240x160 -y -c 400 -n 32 >$@
 
-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 +90,7 @@ cleandep:
 
 .PHONY: cleanlibs
 cleanlibs:
-       $(MAKE) -C libs/aas clean
+       $(MAKE) -C libs/maxmod clean
 
 .PHONY: install
 install: $(bin)
@@ -110,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