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

diff --git a/Makefile b/Makefile
index a83188f..68b1f63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 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
@@ -7,6 +7,7 @@ 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
@@ -41,7 +42,7 @@ $(bin): $(elf)
 	gbafix -r0 $(bin)
 
 $(elf): data/snd.h $(obj) $(libs)
-	$(CC) -o $(elf) $(obj) -specs=gba.specs $(LDFLAGS)
+	$(CC) -o $(elf) $(obj) -specs=gba.specs -Wl,-Map,link.map $(LDFLAGS)
 
 -include $(dep)
 
@@ -50,9 +51,12 @@ 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
 
@@ -65,8 +69,11 @@ tools/mmutil/mmutil:
 %.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)