X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=47632ead8032c0338467e928f794972d8cfb17b6;hb=HEAD;hp=68b1f63e94e47ef3f705f2cf2eaf0a0d22afa947;hpb=c220edbe4acfffc6feb29eea8b977506edac6d99;p=gbajam21 diff --git a/Makefile b/Makefile index 68b1f63..47632ea 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ name = gbajam21 elf = $(name).elf bin = $(name).gba -data = data/tuncross.raw data/tuncross.pal \ +data = data/tuncross.sraw data/tuncross.spal data/tuncross.shade \ data/spr_game.raw data/spr_game.pal \ data/tun.map @@ -21,7 +21,6 @@ CC = $(TCPREFIX)gcc AS = $(TCPREFIX)as OBJCOPY = $(TCPREFIX)objcopy OBJDUMP = $(TCPREFIX)objdump -EMU = vbam opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork dbg = -g @@ -30,7 +29,6 @@ inc = -I. -Ilibs/maxmod CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def) $(inc) ASFLAGS = -mthumb-interwork LDFLAGS = -mthumb -mthumb-interwork $(libs) -EMUFLAGS = -T 100 -f 1 --agb-print -include cfg.mk @@ -63,6 +61,9 @@ tools/mmutil/mmutil: #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 $^ +%.sraw: %.png tools/pngdump/pngdump + tools/pngdump/pngdump -o $@ -oc $(subst .sraw,.spal,$@) -os $(subst .sraw,.shade,$@) -s 8 $< + %.raw: %.png tools/pngdump/pngdump tools/pngdump/pngdump -o $@ -n $<