X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=e3a94463efea8c8cc7e37a65e09d6c9039a7d2ee;hb=f32400a0517cbcd4a37d38884fcb72d3d51fa75c;hp=8b1d20f818e23b4335d834d8c67aef15fee0cb74;hpb=d985165d0e156c785895a5272113ff477bebeeb8;p=gbajam22

diff --git a/Makefile b/Makefile
index 8b1d20f..e3a9446 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 src = $(wildcard src/*.c) $(wildcard src/gba/*.c)
-ssrc = $(wildcard src/gba/*.s) data/lut.s
+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
 elf = $(name).elf
 bin = $(name).gba
 
+data = data/color.raw data/color.pal data/height.raw \
+	   data/spr_game.raw data/spr_game.pal
+
 libs = libs/maxmod/libmm.a
 
 TCPREFIX = arm-none-eabi-
@@ -17,7 +20,7 @@ OBJCOPY = $(TCPREFIX)objcopy
 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
@@ -47,6 +50,7 @@ $(elf): $(obj) $(libs)
 	$(AS) -o $@ $(ASFLAGS) $<
 
 src/data.o: src/data.s $(data)
+src/data.arm.o: src/data.s $(data)
 
 tools/pngdump/pngdump:
 	$(MAKE) -C tools/pngdump
@@ -60,6 +64,9 @@ tools/vistab: tools/vistab.c
 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 $<
 
@@ -95,7 +102,7 @@ install: $(bin)
 
 .PHONY: run
 run: $(bin)
-	mgba -2 $(bin)
+	mgba -3 --log-level=16 $(bin)
 
 .PHONY: debug
 debug: $(elf)