diff --git a/resources/i_fillrect.png b/resources/i_fillrect.png new file mode 100755 index 0000000..5225d17 Binary files /dev/null and b/resources/i_fillrect.png differ diff --git a/resources/i_freehand.png b/resources/i_freehand.png new file mode 100755 index 0000000..eaa02a5 Binary files /dev/null and b/resources/i_freehand.png differ diff --git a/resources/i_line.png b/resources/i_line.png new file mode 100755 index 0000000..89b3651 Binary files /dev/null and b/resources/i_line.png differ diff --git a/resources/i_rect.png b/resources/i_rect.png new file mode 100755 index 0000000..08ff61c Binary files /dev/null and b/resources/i_rect.png differ diff --git a/src/Makefile b/src/Makefile index 3324d2b..0f77f94 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,8 @@ SPLASHSCREEN=splash-vmwcblk.png OBJS=main.o sysinput.o ep_init.o ep_upiwin.o ep_backlight.o ep_msg.o ep_graphics.o ep_devctxt.o ep_bitmap.o \ ep_upiwin_tmp.o ep_util.o fbinit.o rect.o gfxobj.o devctxt.o dc_screen.o fontengine.o \ - bitmap.o fbprimitive.o log.o gpio.o msg_queue.o time_func.o config.o splash.o + bitmap.o fbprimitive.o log.o gpio.o msg_queue.o time_func.o config.o \ + i_freehand.o i_line.o i_rect.o i_fillrect.o splash.o LIBS=-lpython3.7m -lcrypt -lfreetype -lbcm2835 -lpthread -ldl -lutil -lm CFLAGS=-I/usr/include/python3.7m -I/usr/include/freetype2 -I/usr/include/libpng16 \ -Wall -Werror -fstack-protector -fwrapv -fno-PIE -g -O3 -DDEBUG_ASSERT @@ -19,12 +20,24 @@ upiwin: $(OBJS) .c.o: gcc -c $(CFLAGS) $< -splash.o: splash.bin +.bin.o: 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: $(RESOURCES)/$(SPLASHSCREEN) $(BUILDUTILS)/mkgfx $(BUILDUTILS)/mkgfx $(RESOURCES)/$(SPLASHSCREEN) splash.bin +i_freehand.bin: $(RESOURCES)/i_freehand.png $(BUILDUTILS)/mkgfx + $(BUILDUTILS)/mkgfx $(RESOURCES)/i_freehand.png i_freehand.bin + +i_line.bin: $(RESOURCES)/i_line.png $(BUILDUTILS)/mkgfx + $(BUILDUTILS)/mkgfx $(RESOURCES)/i_line.png i_line.bin + +i_rect.bin: $(RESOURCES)/i_rect.png $(BUILDUTILS)/mkgfx + $(BUILDUTILS)/mkgfx $(RESOURCES)/i_rect.png i_rect.bin + +i_fillrect.bin: $(RESOURCES)/i_fillrect.png $(BUILDUTILS)/mkgfx + $(BUILDUTILS)/mkgfx $(RESOURCES)/i_fillrect.png i_fillrect.bin + clean: rm -f upiwin *.o splash.bin *~