X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=27898308600dc7095205d510447993d0ac75af02;hb=7aad8db2edab014c0f750de76bc24bdab63aef2a;hp=e61b6b9cd60c7c257871efaf1096be99eb8bc8c4;hpb=41765ea063cbab26ae05e7259ffc8a7c85db2f5d;p=gbajam22

diff --git a/Makefile b/Makefile
index e61b6b9..2789830 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,11 +19,13 @@ 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) -lm
 
@@ -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,6 +58,9 @@ 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
 
@@ -84,12 +99,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 +115,8 @@ libs: $(libs)
 
 libs/maxmod/libmm.a:
 	$(MAKE) -C libs/maxmod
+
+
+.PHONY: pc
+pc:
+	$(MAKE) -f Makefile.pc