X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=d690745f8deb10465887341fbf569a76a38e7b9d;hb=HEAD;hp=e3e1354fe3659cdce0a1383b24fba5e6d6b04568;hpb=097d03fa2406fca819b27b698ffb1cfc8ac445c2;p=gbajam22

diff --git a/Makefile b/Makefile
index e3e1354..d690745 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,18 @@
 src = $(wildcard src/*.c) $(wildcard src/gba/*.c)
-ssrc = $(wildcard src/gba/*.s) data/lut.s
-obj = $(src:.c=.o) $(ssrc:.s=.o)
-dep = $(src:.c=.d)
-name = gbajam22
+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 = voxelburg
 elf = $(name).elf
 bin = $(name).gba
 
+data = data/color.raw data/color.pal data/color.gpal data/height.raw \
+	   data/spr_game.raw data/spr_game.pal data/spr_game.gpal \
+	   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 \
+	   data/controls.raw data/controls.pal data/controls.gpal
+
 libs = libs/maxmod/libmm.a
 
 TCPREFIX = arm-none-eabi-
@@ -17,7 +24,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
@@ -40,11 +47,21 @@ $(elf): $(obj) $(libs)
 
 -include $(dep)
 
+%.arm.o: %.c
+	$(CC) -o $@ $(CFLAGS) -c $<
+
+%.arm.o: %.s
+	$(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
 
+tools/meshdump/meshdump:
+	$(MAKE) -C tools/meshdump
+
 tools/lutgen: tools/lutgen.c
 	cc -o $@ $< -lm
 
@@ -54,6 +71,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 $<
 
@@ -63,6 +83,12 @@ tools/mmutil/mmutil:
 %.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 >$@
 
@@ -89,12 +115,12 @@ install: $(bin)
 
 .PHONY: run
 run: $(bin)
-	mgba -2 $(bin)
+	mgba -3 --log-level=16 $(bin)
 
 .PHONY: debug
 debug: $(elf)
 	mgba -2 -g $(bin) &
-	$(TCPREFIX)gdb $<
+	$(TCPREFIX)gdb -x gdbmgba $<
 
 .PHONY: disasm
 disasm: $(elf)
@@ -105,3 +131,8 @@ libs: $(libs)
 
 libs/maxmod/libmm.a:
 	$(MAKE) -C libs/maxmod
+
+
+.PHONY: pc
+pc:
+	$(MAKE) -f Makefile.pc