projects
/
gbajam21
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test sprite scaling
[gbajam21]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9da7f4d
..
47632ea
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,7
+6,7
@@
name = gbajam21
elf = $(name).elf
bin = $(name).gba
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
data/spr_game.raw data/spr_game.pal \
data/tun.map
@@
-21,7
+21,6
@@
CC = $(TCPREFIX)gcc
AS = $(TCPREFIX)as
OBJCOPY = $(TCPREFIX)objcopy
OBJDUMP = $(TCPREFIX)objdump
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
opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
dbg = -g
@@
-30,7
+29,6
@@
inc = -I. -Ilibs/maxmod
CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc)
ASFLAGS = -mthumb-interwork
LDFLAGS = -mthumb -mthumb-interwork $(libs)
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
-include cfg.mk
@@
-55,7
+53,7
@@
tools/lutgen: tools/lutgen.c
cc -o $@ $< -lm
tools/tungen: tools/tungen.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
tools/mmutil/mmutil:
$(MAKE) -C tools/mmutil
@@
-63,6
+61,9
@@
tools/mmutil/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 $^
#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 $<
%.raw: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -n $<
@@
-73,7
+74,7
@@
data/lut.s: tools/lutgen
tools/lutgen >$@
data/tun.map: tools/tungen
tools/lutgen >$@
data/tun.map: tools/tungen
- tools/tungen -s 256x256 >$@
+ 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)