test sprite scaling

[gbajam21] / Makefile

diff --git a/Makefile b/Makefile
index 301519d..47632ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 src = $(wildcard src/*.c)
-ssrc = $(wildcard src/*.s)
+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 = data/tuncross.sraw data/tuncross.spal data/tuncross.shade \
+          data/spr_game.raw data/spr_game.pal \
           data/tun.map
 
 audata = data/audio/popcorn.mod
@@ -20,7 +21,6 @@ CC = $(TCPREFIX)gcc
 AS = $(TCPREFIX)as
 OBJCOPY = $(TCPREFIX)objcopy
 OBJDUMP = $(TCPREFIX)objdump
-EMU = vbam
 
 opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
 dbg = -g
@@ -29,7 +29,6 @@ inc = -I. -Ilibs/maxmod
 CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc)
 ASFLAGS = -mthumb-interwork
 LDFLAGS = -mthumb -mthumb-interwork $(libs)
-EMUFLAGS = -T 100 -f 1 --agb-print
 
 -include cfg.mk
 
@@ -50,23 +49,32 @@ src/data.o: src/data.s $(data)
 tools/pngdump/pngdump:
        $(MAKE) -C tools/pngdump
 
-tools/tungen: tools/tungen.c
+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 $^
 
+%.sraw: %.png tools/pngdump/pngdump
+       tools/pngdump/pngdump -o $@ -oc $(subst .sraw,.spal,$@) -os $(subst .sraw,.shade,$@) -s 8 $<
+
 %.raw: %.png tools/pngdump/pngdump
        tools/pngdump/pngdump -o $@ -n $<
 
 %.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/snd.bin: $(audata) tools/mmutil/mmutil
        tools/mmutil/mmutil -o$@ -hdata/snd.h $(audata)