projects
/
gbajam21
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed the tunnel precalc to produce a continuous 10 bit depth value
[gbajam21]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
301519d
..
68b1f63
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
src = $(wildcard src/*.c)
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
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 \
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
data/tun.map
audata = data/audio/popcorn.mod
@@
-50,9
+51,12
@@
src/data.o: src/data.s $(data)
tools/pngdump/pngdump:
$(MAKE) -C tools/pngdump
tools/pngdump/pngdump:
$(MAKE) -C tools/pngdump
-tools/tungen: tools/tungen.c
+tools/lutgen: tools/lutgen.c
cc -o $@ $< -lm
cc -o $@ $< -lm
+tools/tungen: tools/tungen.c
+ cc -o $@ -O3 -fopenmp $< -lm -lgomp -lpthread
+
tools/mmutil/mmutil:
$(MAKE) -C tools/mmutil
tools/mmutil/mmutil:
$(MAKE) -C tools/mmutil
@@
-65,8
+69,11
@@
tools/mmutil/mmutil:
%.pal: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -c $<
%.pal: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -c $<
+data/lut.s: tools/lutgen
+ tools/lutgen >$@
+
data/tun.map: tools/tungen
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)
data/snd.bin: $(audata) tools/mmutil/mmutil
tools/mmutil/mmutil -o$@ -hdata/snd.h $(audata)