hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
3 changed files with 6 additions and 6 deletions
Showing only changes of commit 2526184dfe - Show all commits

View File

@ -1,7 +1,7 @@
all: mksplash all: mkgfx
mksplash: mksplash.c mkgfx: mkgfx.c
gcc -o mksplash -O -Wall -I/usr/include/libpng mksplash.c -lpng16 -lz gcc -o mkgfx -O -Wall -I/usr/include/libpng mkgfx.c -lpng16 -lz
clean: clean:
rm -f *.o mksplash rm -f *.o mkgfx

View File

@ -23,8 +23,8 @@ splash.o: splash.bin
objcopy -I binary -O elf32-littlearm -B arm --rename-section \ objcopy -I binary -O elf32-littlearm -B arm --rename-section \
.data=.rodata,alloc,load,readonly,data,contents splash.bin splash.o .data=.rodata,alloc,load,readonly,data,contents splash.bin splash.o
splash.bin: $(RESOURCES)/$(SPLASHSCREEN) $(BUILDUTILS)/mksplash splash.bin: $(RESOURCES)/$(SPLASHSCREEN) $(BUILDUTILS)/mkgfx
$(BUILDUTILS)/mksplash $(RESOURCES)/$(SPLASHSCREEN) splash.bin $(BUILDUTILS)/mkgfx $(RESOURCES)/$(SPLASHSCREEN) splash.bin
clean: clean:
rm -f upiwin *.o splash.bin *~ rm -f upiwin *.o splash.bin *~