From 62204682af643bd0cf20306d0fd21e2d79b5e721 Mon Sep 17 00:00:00 2001 From: Amy Bowersox Date: Wed, 11 Dec 2019 13:20:45 -0700 Subject: [PATCH] adding the four "tool" icons to bind into the executable (this works for now) --- resources/i_fillrect.png | Bin 0 -> 672 bytes resources/i_freehand.png | Bin 0 -> 813 bytes resources/i_line.png | Bin 0 -> 783 bytes resources/i_rect.png | Bin 0 -> 666 bytes src/Makefile | 19 ++++++++++++++++--- 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100755 resources/i_fillrect.png create mode 100755 resources/i_freehand.png create mode 100755 resources/i_line.png create mode 100755 resources/i_rect.png diff --git a/resources/i_fillrect.png b/resources/i_fillrect.png new file mode 100755 index 0000000000000000000000000000000000000000..5225d17311bb6e82a17343091bf6d1171b78d649 GIT binary patch literal 672 zcmV;R0$=@!P)EX>4Tx04R}tkv&MmKpe$iQ%glF4t5Z6$WUFhAS&W0RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5Oi*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`TKD8H4CS?zG}mbkBaS5`kc0>sHIz|-g($5WDJD|1AM@}JIsPQMWO9|k z$gzMbR7j2={11M2YZj&^-K05bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMa>thv3l_Hp_EWT>m<8{ps& z7%fuvy2rb_JA3>0Osl^iYZP*%unD+S00009a7bBm001r{001r{0eGc9b^rhX2XskI zMF-;y3lt767mtEr0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbN zib+I4R9M69*s%?OAQXh*6D{f3#d#Qw0hq*uid7uIj*`M?a+?2@P`oc(AbBjUHQ7|H zHCSmR1uKoDZ7lWP9b`t40s1Ito9yMBU+P*)A+k3j8+F9^NVEMsxn+O=0RjXF5FkK+ z05NskoEC`8A+pH?PGo=p0s8&JIDYmmPRK_iX-z3vMRoz0h#8n6iep&-0000EX>4Tx04R}tkv&MmKpe$iQ%glF4t5Z6$WUFhAS&W0RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5Oi*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`TKD8H4CS?zG}mbkBaS5`kc0>sHIz|-g($5WDJD|1AM@}JIsPQMWO9|k z$gzMbR7j2={11M2YZj&^-K05bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMa>thv3l_Hp_EWT>m<8{ps& z7%fuvy2rb_JA3>0Osl^iYZP*%unD+S00009a7bBm001r{001r{0eGc9b^rhX2XskI zMF-;y3ls|!tn{yz0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbO z7fD1xR9M69m_ZVQAPhw#%?-FZAJiYr&%raPuXEe1&FpH`Nj^7uc5;IeHS!L)T< z0~8Gr1t=OK;@q|GI|3PyWjBznab-+I>My61W&mAs6i?b>8Ca%Yz^G*vUkV5jvC?VD zM@L5F`JzrP% zz6Ldh(QJh-9S>0QxC3?E0vJRXccAWM5kQ>sQfRyaVb`GPNb3P1Zrp=EX>4Tx04R}tkv&MmKpe$iQ%glF4t5Z6$WUFhAS&W0RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5Oi*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`TKD8H4CS?zG}mbkBaS5`kc0>sHIz|-g($5WDJD|1AM@}JIsPQMWO9|k z$gzMbR7j2={11M2YZj&^-K05bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMa>thv3l_Hp_EWT>m<8{ps& z7%fuvy2rb_JA3>0Osl^iYZP*%unD+S00009a7bBm001r{001r{0eGc9b^rhX2XskI zMF-;y3lt0*1Pv5c0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbN z`AI}UR9M69*uf3MAPfaiCuIW`WHb-JDx6p-hgKY#v;kv(xhgqDoSrcH*leW~a`WY! zcUKxB+FfagD72+os|T5*k}c4Wg2Lr$O6mE-%)WN0$sCmoY`O-$RSIePxIHbhNGxA9F1|!TgkklB{*wq0r4c}$fCduV$Y7*Y|cCjgMKa3)3svoj2 z%{FN2v8mHBDw@<|x+el$e%h%ve<*#UwoYj%PME<^wT N002ovPDHLkV1iP&QCt83 literal 0 HcmV?d00001 diff --git a/resources/i_rect.png b/resources/i_rect.png new file mode 100755 index 0000000000000000000000000000000000000000..08ff61c0695cf91377eb1c36444ae41c5d134711 GIT binary patch literal 666 zcmV;L0%iS)P)EX>4Tx04R}tkv&MmKpe$iQ%glF4t5Z6$WUFhAS&W0RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5Oi*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`TKD8H4CS?zG}mbkBaS5`kc0>sHIz|-g($5WDJD|1AM@}JIsPQMWO9|k z$gzMbR7j2={11M2YZj&^-K05bWxZD8-pLEHP9LY~pC=`JAGy0|+FmMa>thv3l_Hp_EWT>m<8{ps& z7%fuvy2rb_JA3>0Osl^iYZP*%unD+S00009a7bBm001r{001r{0eGc9b^rhX2XskI zMF-;y3lt4IQGYc_0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbN zgh@m}R9M69*ue?FAP_{+iLnD4v@{E_6;C#lo5x^4VI+T#dhoF$!g{sVWK*@)V5N~1 ztTdA1Sn9ny$c!QbbSNmk?B$#{omxsEvK^7lbof)v+yNp31PBlyK!5-N0tD!fQ^&rE zk;v9YwrV~kGC+U;o%k@0pM8rC`Di5FDJ84O9+&VKn$e5RJOBUy07*qoM6N<$f@nDy Axc~qF literal 0 HcmV?d00001 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 *~