X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=e3a94463efea8c8cc7e37a65e09d6c9039a7d2ee;hb=c52a5978823a77da3570cb73b985b928bb8358d9;hp=db4dd958ad967197144ceb30e7c3bcf59fdab2ba;hpb=f57fab6afe62f2a476ef4afa1842c81722816451;p=gbajam22

diff --git a/Makefile b/Makefile
index db4dd95..e3a9446 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
-src = $(wildcard src/*.c)
-ssrc = $(wildcard src/*.s) data/lut.s
-obj = $(src:.c=.o) $(ssrc:.s=.o)
-dep = $(src:.c=.d)
+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)
 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-
@@ -16,13 +19,15 @@ AS = $(TCPREFIX)as
 OBJCOPY = $(TCPREFIX)objcopy
 OBJDUMP = $(TCPREFIX)objdump
 
+def = -DBUILD_GBA
 opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
 dbg = -g
-inc = -I. -Ilibs/maxmod
+inc = -I. -Isrc -Isrc/gba -Ilibs/maxmod
+warn = -pedantic -Wall
 
-CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc)
+CFLAGS = $(opt) $(dbg) $(warn) -MMD $(def) $(inc)
 ASFLAGS = -mthumb-interwork
-LDFLAGS = -mthumb -mthumb-interwork $(libs)
+LDFLAGS = -mthumb -mthumb-interwork $(libs) -lm
 
 -include cfg.mk
 
@@ -38,7 +43,14 @@ $(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
@@ -46,9 +58,15 @@ tools/pngdump/pngdump:
 tools/lutgen: tools/lutgen.c
 	cc -o $@ $< -lm
 
+tools/vistab: tools/vistab.c
+	cc -o $@ $< -lm
+
 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 $<
 
@@ -84,12 +102,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)
@@ -100,3 +118,8 @@ libs: $(libs)
 
 libs/maxmod/libmm.a:
 	$(MAKE) -C libs/maxmod
+
+
+.PHONY: pc
+pc:
+	$(MAKE) -f Makefile.pc