From 1cab4c80a935fecb057736cf4a84dd52f7ab2b81 Mon Sep 17 00:00:00 2001 From: smea Date: Tue, 11 Mar 2014 17:09:39 +0100 Subject: [PATCH] gpu : oops --- gpu/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gpu/Makefile b/gpu/Makefile index 7b1e1c7..6591a65 100644 --- a/gpu/Makefile +++ b/gpu/Makefile @@ -11,10 +11,10 @@ LDFLAGS += -nostartfiles --specs=ccd00.specs -L"$(DEVKITARM)/arm-none-eabi/lib" CFILES = $(wildcard source/*.c) VSHFILES = $(wildcard source/*.vsh) -VSHBINFILES = $(VSHFILES:source/%.vsh=data/%.vsh.bin) +SHBINFILES = $(VSHFILES:source/%.vsh=data/%.shbin) BINFILES = $(wildcard data/*.bin) -BINFILES += $(VSHBINFILES) OFILES = $(BINFILES:data/%.bin=build/%.bin.o) +OFILES += $(SHBINFILES:data/%.shbin=build/%.shbin.o) OFILES += $(CFILES:source/%.c=build/%.o) DFILES = $(CFILES:source/%.c=build/%.d) SFILES = $(wildcard source/*.s) @@ -42,7 +42,7 @@ dir: $(PROJECTNAME).bin: $(PROJECTNAME).elf $(OBJCOPY) -O binary $< $@ -$(PROJECTNAME).elf: $(VSHBINFILES) $(OFILES) +$(PROJECTNAME).elf: $(SHBINFILES) $(OFILES) # $(LINK) $(LDFLAGS) -o $(PROJECTNAME).elf $(filter-out build/crt0.o, $(OFILES)) -lctru -lc -lgcc $(LINK) $(LDFLAGS) -o $(PROJECTNAME).elf $(filter-out build/crt0.o, $(OFILES)) -g -lctru -lm -lc -lg @@ -53,7 +53,7 @@ clean: -include $(DFILES) -data/%.vsh.bin: source/%.vsh +data/%.shbin: source/%.vsh @python $(AEMSTROPATH)/aemstro_as.py $< $@ build/%.o: source/%.c @@ -64,6 +64,10 @@ build/%.o: source/%.s $(CC) $(CFLAGS) -c $< -o $@ @$(CC) -MM $< > build/$*.d +build/%.shbin.o: data/%.shbin + @echo $(notdir $<) + @$(bin2o) + build/%.bin.o: data/%.bin @echo $(notdir $<) @$(bin2o)