X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=3484b4a94e0ae8b492fe05600dbcd9ae25ea2519;hb=HEAD;hp=9bb51131eb60ce0551f861b48af6155439af23b7;hpb=3eebc6b38f3ad1fd082ae9d4d3263c42c384951c;p=gba_blender

diff --git a/Makefile b/Makefile
index 9bb5113..3484b4a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,20 @@
 src = $(wildcard src/*.c)
 ssrc = $(wildcard src/*.s)
-#dataobj = data/data.o
 obj = $(src:.c=.o) $(ssrc:.s=.o) $(dataobj)
 dep = $(src:.c=.d)
 name = blender
 elf = $(name).elf
 bin = $(name).gba
 
+data = data/bg.raw data/bg.pal \
+	   data/sprites.raw \
+	   data/sprites1.pal \
+	   data/sprites2.pal \
+	   data/sprites3.pal \
+	   data/sprites4.pal \
+	   data/sprites5.pal \
+	   data/sprites6.pal
+
 ARCH = arm-none-eabi-
 
 CPP = $(ARCH)cpp
@@ -17,8 +25,9 @@ EMU = vbam
 
 opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
 #dbg = -g
+def = -DALT_LCLIP
 
-CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD
+CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def)
 ASFLAGS = -mthumb-interwork
 LDFLAGS = -mthumb -mthumb-interwork -lm
 EMUFLAGS = -T 100 -f 1 --agb-print
@@ -36,13 +45,16 @@ $(elf): $(obj)
 
 -include $(dep)
 
-src/data.o: src/data.s data/bg.raw data/bg.pal data/sprites.raw data/sprites.pal
+src/data.o: src/data.s $(data)
 
 tools/pngdump/pngdump:
 	$(MAKE) -C tools/pngdump
 
+data/sprites.raw: data/sprites1.png data/sprites2.png data/sprites3.png data/sprites4.png data/sprites5.png data/sprites6.png
+	tools/pngdump/pngdump -o $@ -n $^
+
 %.raw: %.png tools/pngdump/pngdump
-	tools/pngdump/pngdump -o $@ $<
+	tools/pngdump/pngdump -o $@ -n $<
 
 %.pal: %.png tools/pngdump/pngdump
 	tools/pngdump/pngdump -o $@ -c $<