projects
/
gbajam22
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
destroy enemies, increment counters, detect victory
[gbajam22]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
268d1ee
..
5eb729d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,11
+2,14
@@
src = $(wildcard src/*.c) $(wildcard src/gba/*.c)
ssrc = $(wildcard src/*.s) $(wildcard src/gba/*.s) data/lut.s
obj = $(src:.c=.arm.o) $(ssrc:.s=.arm.o)
dep = $(src:.c=.arm.d)
ssrc = $(wildcard src/*.s) $(wildcard src/gba/*.s) data/lut.s
obj = $(src:.c=.arm.o) $(ssrc:.s=.arm.o)
dep = $(src:.c=.arm.d)
-name = gbajam22
+name = voxelburg
elf = $(name).elf
bin = $(name).gba
elf = $(name).elf
bin = $(name).gba
-data = data/color.raw data/color.pal data/height.raw
+data = data/color.raw data/color.pal data/color.gpal data/height.raw \
+ data/spr_game.raw data/spr_game.pal data/spr_logo.raw data/spr_logo.pal \
+ data/menuscr.raw data/menuscr.pal data/menuscr.gpal \
+ data/spr_menu.raw data/spr_menu.pal
libs = libs/maxmod/libmm.a
libs = libs/maxmod/libmm.a
@@
-19,7
+22,7
@@
OBJCOPY = $(TCPREFIX)objcopy
OBJDUMP = $(TCPREFIX)objdump
def = -DBUILD_GBA
OBJDUMP = $(TCPREFIX)objdump
def = -DBUILD_GBA
-opt = -O0 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
+opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
dbg = -g
inc = -I. -Isrc -Isrc/gba -Ilibs/maxmod
warn = -pedantic -Wall
dbg = -g
inc = -I. -Isrc -Isrc/gba -Ilibs/maxmod
warn = -pedantic -Wall
@@
-54,6
+57,9
@@
src/data.arm.o: src/data.s $(data)
tools/pngdump/pngdump:
$(MAKE) -C tools/pngdump
tools/pngdump/pngdump:
$(MAKE) -C tools/pngdump
+tools/meshdump/meshdump:
+ $(MAKE) -C tools/meshdump
+
tools/lutgen: tools/lutgen.c
cc -o $@ $< -lm
tools/lutgen: tools/lutgen.c
cc -o $@ $< -lm
@@
-63,6
+69,9
@@
tools/vistab: tools/vistab.c
tools/mmutil/mmutil:
$(MAKE) -C tools/mmutil
tools/mmutil/mmutil:
$(MAKE) -C tools/mmutil
+#data/spr_game.raw: data/spr_ui.png data/spr_hud.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 $<
%.sraw: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -oc $(subst .sraw,.spal,$@) -os $(subst .sraw,.shade,$@) -s 8 $<
@@
-72,6
+81,12
@@
tools/mmutil/mmutil:
%.pal: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -c $<
%.pal: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -c $<
+%.gpal: %.png tools/pngdump/pngdump
+ tools/pngdump/pngdump -o $@ -c -g $<
+
+%.555: %.png tools/pngdump/pngdump
+ tools/pngdump/pngdump -o $@ -555 $<
+
data/lut.s: tools/lutgen
tools/lutgen >$@
data/lut.s: tools/lutgen
tools/lutgen >$@
@@
-98,7
+113,7
@@
install: $(bin)
.PHONY: run
run: $(bin)
.PHONY: run
run: $(bin)
- mgba -2 $(bin)
+ mgba -3 --log-level=16 $(bin)
.PHONY: debug
debug: $(elf)
.PHONY: debug
debug: $(elf)