From ad20a7ecb9b3aaf18c57f8c9b17b523691b6a50e Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 2 Aug 2015 13:36:55 +0000 Subject: [PATCH] Autobuild: - uploaded libkmenu.obj binnary and added to autobuild - games megamaze and phoenix moved to iso - rename ImgF/* to uppercase git-svn-id: svn://kolibrios.org@5647 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 23 ++++++++++++----------- data/common/lib/kmenu.obj | Bin 0 -> 8633 bytes 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 data/common/lib/kmenu.obj diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 6ccfef4be2..7e23f83f97 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -57,14 +57,14 @@ img_files = { {"File Managers/EOLITE.INI", "common/File Managers/eolite.ini"}, {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, {"File Managers/KFM.INI", "common/File Managers/kfm.ini"}, - {"GAMES/MEGAMAZE", build_type .. "/games/megamaze"}, {"LIB/PIXLIB.OBJ", "common/lib/pixlib.obj"}, {"LIB/ICONV.OBJ", "common/lib/iconv.obj"}, {"LIB/NETCODE.OBJ", "common/lib/netcode.obj"}, - {"MEDIA/ImgF/ImgF", "common/media/ImgF/ImgF"}, - {"MEDIA/ImgF/cEdg.obj", "common/media/ImgF/cEdg.obj"}, - {"MEDIA/ImgF/dither.obj", "common/media/ImgF/dither.obj"}, - {"MEDIA/ImgF/invSol.obj", "common/media/ImgF/invSol.obj"}, + {"LIB/KMENU.OBJ", "common/lib/kmenu.obj"}, + {"MEDIA/IMGF/IMGF", "common/media/ImgF/ImgF"}, + {"MEDIA/IMGF/CEDG.OBJ", "common/media/ImgF/cEdg.obj"}, + {"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"}, + {"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"}, {"SETTINGS/NETWORK.INI", build_type .. "/settings/network.ini"}, {"NETWORK/FTPD.INI", "common/network/ftpd.ini"}, {"NETWORK/USERS.INI", "common/network/users.ini"}, @@ -140,14 +140,16 @@ extra_files = { {"kolibrios/emul/", "common/emul/gameboy"}, {"kolibrios/emul/", "common/emul/scummvm"}, {"kolibrios/emul/", "common/emul/zsnes"}, + {"kolibrios/games/doom/", "common/games/doom/*"}, {"kolibrios/games/pig/", "common/games/pig/*"}, + {"kolibrios/games/fara/fara.gfx", "common/games/fara.gfx"}, + {"kolibrios/games/jumpbump/", "common/games/jumpbump/*"}, + {"kolibrios/games/LaserTank/", "common/games/LaserTank/*"}, + {"kolibrios/games/lrl/", "common/games/lrl/*"}, + {"kolibrios/games/megamaze", build_type .. "/games/megamaze"}, + {"kolibrios/games/phenix", PROGS .. "/games/phenix/trunk/phenix"}, {"kolibrios/games/soko/soko", build_type .. "/games/soko"}, {"kolibrios/games/soko/", "common/games/soko/*"}, - {"kolibrios/games/doom/", "common/games/doom/*"}, - {"kolibrios/games/fara/fara.gfx", "common/games/fara.gfx"}, - {"kolibrios/games/LaserTank/", "common/games/LaserTank/*"}, - {"kolibrios/games/jumpbump/", "common/games/jumpbump/*"}, - {"kolibrios/games/lrl/", "common/games/lrl/*"}, {"kolibrios/drivers/", "common/drivers/*"}, {"kolibrios/lib/avcodec-55.dll", "common/lib/avcodec-55.dll"}, {"kolibrios/lib/avdevice-55.dll", "common/lib/avdevice-55.dll"}, @@ -331,7 +333,6 @@ tup.append_table(img_files, { {"GAMES/LINES", PROGS .. "/games/lines/lines"}, {"GAMES/MBLOCKS", PROGS .. "/games/mblocks/trunk/mblocks"}, {"GAMES/MSQUARE", PROGS .. "/games/MSquare/trunk/MSquare"}, - {"GAMES/PHENIX", PROGS .. "/games/phenix/trunk/phenix"}, {"GAMES/PIPES", PROGS .. "/games/pipes/pipes"}, {"GAMES/PONG", PROGS .. "/games/pong/trunk/pong"}, {"GAMES/PONG3", PROGS .. "/games/pong3/trunk/pong3"}, diff --git a/data/common/lib/kmenu.obj b/data/common/lib/kmenu.obj new file mode 100644 index 0000000000000000000000000000000000000000..171fa0ab51516ee628269037bc1281087fcc8fc0 GIT binary patch literal 8633 zcmV;qAx7RyP(w@7UjP7s0001=JOC!&%yr!7tnt16=?JqV(f1!8pTTS@KdJK@Omn<+ zs|YfvvD^LneoeFYpuIj`hHCo)8%U!{kF>uePDP{gWKs>H&<(oy%*G4+h!`Wg4IZtl z|0nz?KTf^Z>y0Wqa{g$gD)kR+ zYgD+zIozFZAiZ8AvfjX`J2QfnAu&C^V;M(bBr@(iBx!-&XF%@pfQ67Muj1i;o z^CmU=&LCKH-!yzgW4>D8q1>=pTIb<|AU-`YYBE%h5d{S`2uo{cR=~69`DQSwk)Y2c z>man^Qsl}ohMin|xm*#;Zk4iIW~Lqaw6M_bE?jN2xi{jcT#wU_q|Oy7t@-4M4%O&O z8y!>t%i_H~zsf#zQ*G06Z5}f}G0jIG{e=JRphroS(g%R^VI$?MWW#aTm@rb4qu|=@ zCVxBDdD)dQ`+mhUKWgbHmw<-1|Cl7<14rd(+k=6DcYcyyq<>q6J4)Cz6@ShU6buF7 z6msH(MUTyCD z=u&Rzn?6(WO%1@k z@byq&V;zt$rMWS0WpBg1BW1T6g%xpj0}hlk`{;<6;&Hm#2KD5qzOje`@_C-NV)LuH zZYQJ_Vr@8ERJtFpk|A2NftOoj$Pd3sO0fg1rKoY9)#PEK#l{hSGY0(QyFHk0Y zEq-k?x3L1_K7_?!-5Px^Wu%*Wn`1&l4%wQ&1WgaQ%N2x}5*ICmNf0TYsm839-%v#N zDA^0O$E13P*dDt>?(9K=87c+!YJw1k47smX*=&$9T-z~}%1}HX<;>`HmTn}K4FZBl zqeNjvwO2^_OVE5F68aMX6?UrYOvzAR3uc)eIrJ7=h+>*5Odp>g9UnY^-b2qx&9*pF~ z{VGTPrWE6YMV&=&d|gC!*L72)2+NO5-2f#c3Bk&TC4Y@6^jET`#=UENr|(i!`+2lj zl!ixoIu9U<$mSrCaqIX7m&tQph!O_HsrMcW1bALm8TgFaq?>`S<{ojpIpKzb?2L~J zT#8dfcVaJJb~t(l+}d;}MIuH=xxTzE8@~N0Wf_=>h(KFM1&RB+=zt<*e_vl-`V65$ zr#$8a_|+MW3bwOSTKb=>C{9^Z=MJwjDghfO{^tMj+yF@bjQ)y#&qUAIA^a;0-~>CE zPOx>eh&D2Z3eAoEH~9pOV7kY>ggiJ!bQ=$x{`$CTUp#l19)UMXq$Ng`14$5Dd`q@a zdvmW^=5OydJkt|@(tFQKs~Q7i%D+sN<%|aOP8Vu$^l6zg8x(15=BJ3`Tm`Qw=C-J~ z47|(dl14F@-UuX~i)1v{CT=VT<3m_j{Dt%~UjDGo8D3d~(wp^SUXW7|XG(5Cq-7-( z*O?BVv7BjBEM@e{r@|S{6B?~l5y8w{z+ROdWNcJ&8{VEgZPzP4J`-7e7`_q1k@GN< zu=rL~lkH;Px!yW+Lv${Wo!yiAZ+X)AWd)4)rhYptPHE4Ra3nqwlIVeF(qxt8#1(;} zNvAB!t33TbylMfn$DHNc!bkaOmC4e}`mJ9SeQ(;cL6>-@4CV&aCxPe}mp%4D7&y;i z+{|IK?bw#PO@fG|1yqWALKj}OcHp-7YTDB*bGa)B%Mi(tgai`)Eovc7j=!UKK|7g~}xvHLLT0~c} zjxr;Ge8W6Ij*pryLEy(_P=;o(PFNe@or@gg?9=>Ph87v)p!-ei8n?B@{Rj8 zdHEl;@DJwRZT%1KyI9m2yTdCBQ}Bp!)V7$=?S|J`_T8_y@CrT>gWnPcywap#LsiYD)h`r?%cf$IQ}_f|JBBz!JHWg#-X!KqSk>TL>En0l%V zBOfsguf9}$6mI#~0~Jk@lzFgT2y4U}E>w9BZ6pN(e0OUL=l`A@sbAZE&ys33wHzcvb`KSqjcd#Hs&>bDVa zu(Aj*Stf;;-#nNf4GjuA%qtC9BF#ccmCOP3&jP0tG{_aok4@M(Y@?1iG*la`!Q$&UB`tL6=6 zk_ATo8k)YTow}t^HjmR(K@B;fKwK8W&!dEd^FY2_!R{(vG5^LVjinK1&vc0Y#29rL zi?4#y?y5?uLFWdJx=eWbR7+1Jl7^|k!R0>lob;|1l2-lDP^4whfk$?_L}g`v9wez^ zzxzM3hI(gIN4#j)%BWXScT};X%0m6{&sZus1Prx9S0#c~lS!#AWfn+EjeDi47<*r& z{Mw!RVTj23e$MUnN(E3s{Z8B(T!Px=ZK^*%`NWZcSzMjA`lhi#;3f^JO@kz9YIg;b z7aHAzdSpOB%nG{`Um45huA^T0VunXOt=lCzY@+9Ig~C`<6ujxbtsQh1&XN|tURpo` z*W}(;m2Q0v!*I!+wR*_lc$mRjTs=>sRJbb#P_(CS#idev1%#-8J4QmjWtIxpEpo0J z9_jm{)1)apxBtBMH2e3P6DZU*3t<~sEOwWveU>ATx=~Gq;CF8!*y>mBq=RRYh88Ar09m>xFC6*po2kKrtR#Ds@U_-#_q9igzAa;hirju$-5!W z3X1*H3QLxFkwhOlNZm-g95L7UKjtsk6H?pwfQ`62RU@uwe^Fssn~n>jnq#f!h&e1_ z6&#SElZprpV8Fp!`deANIFvMLI9?hs=f|QVdlshzYD;|Fs0p8V6qT0}G?;^OIg*$| zd9_Pbmr4;$mf@>C_tq1{Bwrche7M;+RgS`$$`K@V+vWm3u)k+QmFKCXV0eM92^>RQ z))#O@(cDGd?XPB#D<=roQQ`Ex>94x4qDW1T2mx9S(ewR#SjL;FvN}QXiesx%0>|(V zrEC9YgYM#Rh)mF*@2Hq+8-Pgc)i&kRB$giau$w#88VIk}$DlAG*zL>?R_ug&8&^06X$$vFOZsMs}{-7BLM|;$~6xqZEIN=TvuO*3X50YiJyC^28zsI_|o>EeX1pb-Z{zInr7=He4`|8_Gwv_T&Yx z`eY>ZtJ=;T3z8Wh4f`ov{MF=e`k^V0RE8mtn|=p%#L)X=MdXi4*ng5f*iGeUbf|k1 zgR=bWPQ3yrxUGSJ8S?WhOTNF#c!9ga&1{rx>MnC1fh2^w`F#F(M|p9=UQH_CIY< zNVmUWXpV@o2w<>R_XuKeJQj*8aAhO>K)~@ef@y808<_(P1AD697eNL53Mt$In zw=AJS+rl0Q4hIw$YQb;d{`Q~#2mWToKcEz8Ct>6cm|ogF;M5EZZ%_sI8=Z@^0f zl0Bxe#x^tgMuQIAdq1*7)2c86i=03*v8*kNl*TID>dDRyqaNcFda=5%)Wi#@@D>C0NYn}Z17RQna^uPfQi3|Xh#zhsJG5bS*!0JrO zApgLU4w1JDMZbSBis(iA3WeqW4S*|DXkK}TlSggKi{C?Q1+M%{svY%P+2ckMW7LIt z{4t|Zk6K)10vXlEO&&wz`_ZwVZGE+sZP=Ho#v*X%6l+`!-5)d!%jZ+)P%6r7ye@?E z)Wkhyg9uiTzLJz!=BJ6cwg4h4(}kC)=e#lIRA9@fEf?(%1?3+< znc?A(JnSk6_$6Q{S|3h{#>?w+TnGLC1BNy=%u2TB`k8;W=c~%Aj9!U>-=FaJl2Dc3 z4;;wRz^ZHrt6k0?u4&;STv)%F=1~89>I#24SyJxQ*^ig>H8fMQnjEO3Ir_SFH&81Q z+hWOg;AE*l=$!!fMIO3FR+qS2F%uQRzBcwgp!Lk3nY!B(LNf!@DjIf-z6Fj+Bw-V+ z9MtoJDnkZan`Ejmv~*BSIs=^~-IT34AO9^2L0UK8b`A~}Q1OS1~bHm|N1xBA! znO-qn03?&FYYBe1>^=J5zNu>iZk|{x5(Y?h6}D-Rifk~rfu*@ay$lNI^y+`i?CVRx z_r~&3whb2vUOcav0qa3gM}dPGzWMrwnk1wsSmDui#kT?)9C8Q67<%XYrXU zNN^+$J9sQsFspWoH@5Dw4W4A^^-XaX0uovr(`J41^e?7|1y5n&H@3a(PbyIuJ2y1i z%TDmUW`^FmIl3EVc(DQLW~pd>t;raIqQG)G>Zy3URWwyo3J*t&Di?#Y*g7fQB~2h?yw4Q&A`_9ilygY|^Mo>rO^QocEZkg;);V`nI2 zO?}REUho{>nT_Xj1EI?A{2)j|Y8@MMqx z&5g(gBJ){FhE*oK^-Y+m(Fn*|mZk%@uh19NUb@~sUSlPTU+q**mk1}&_xBGO!}w5Gz3-B@Q`+CkG7T%Rcd9R8f7NnpQSo((CBp!pBKOD~7K^auc~M{B$g~MgZ4pW#q@W+a`J`*z8;^`zke{ z6gsMZ{-L6A>R|tR&U2EX(NkMS38Q<}!B+RStoo#bCT{4|r4fjIx z6f)w5MVZ}8Av57->XtDMT5fX_58$P+?^4E_sUB?@OCiNnA5d_;IO$%s^eRA745XA= z+Z)zj-|p_20<6pjyI`ZK=>&m%*4_Tb(qKC3 z_}wT3-eG?;iKI^#`knsv(1`44lNGZ!G3d%zf#oy>w#F;2VH)YE^E~Y)892hV-&VQU zNhcnKX1&nY1}u~bB3(3=|4$zkFBba=I<QxdLJ0t|<%1VaH_b9!-m=4pA(e zj~(nJ3=jJz?gla5d7YPIsl_8Org569E4Ce}g^P}{oNquBzHzBHC+%@w(SfK~dPhIz zpWVeCHg3|>fsldSEP(5z#uI03tfx>`7tP(&?S^7f{zvQ#^lMqT@~HyPk9z4Q-ag9B z8Pi7}c1u5V4hdq+r`4cTG?mgT_?s@5WesYhl!YIxe(1+*DxlW*sy`;QCw)rTN#oJO=xbu^%gGF@)4zH zF~d=%E7vz=bJDfN)#-aw-Cdl4#=xoSConte<6q7OKV)HwDIJyaorgH$*_|pTJvg5r z75#|S#+B2zqyN*YUjAj_(rlm>W2)cCxQsxyGSscW{Sl2YiPP7Ae8b?3&FYhXu`j8i zL@*&V``emGUBCAmt9|8K7ii>eX9O=H?_6{?aPs+Y7FX{)?^d9Cc`k> z$Kiy3D+xU_XYtMe%mBXX7+{k^<~syja6pORONM^i5|4oBj|s0(w!ORYS3I4>5wnoSr(9LcEW4(+}ud>M@jI9gqmm6$b+sC#D=3k7{Y08k!b^BAL7Xxo^|vRSjnYHqE_YSl;R zE!yhC*QD%$;>9IgSC##dOW?dVW!j1WGn8X)vDFV0#NY^kD-DY5mw5i07Zn5?`JpM zjE;+dRUb?vydrOjNa0z97^-qFvej#HpNdr9`)xdrF0CEM9l7kM#TYJB|HD`( zP#Wy7cTFk+Zw~1)BFkb740a4`52uJBoGAa|$;zpdA|UZC>k_FpiHSUB*q>IsBoEJM z24cuV@)y#fSU#8%1cTR~g{)wg6*6}t9jqA{j(2m=tmMJ|Li&GWp83Lxt{nomAlHV$ zz#KiqR;x<6MYA7_4#?S82A!U#`J#j?B^rjXFcVTCxNlOW$Z9ARKI=y)dsE^N8-4+C zy_w?xk`ZGO@AiJl?Qn!c6tV}7T zZTN=1thnoRNz@?Dx!rjW5NYd&$M+4*DhHq8-G!?$a-a1OCmeBTyCewM=bYJ~-Su6tBT+@xU%unJ$syO3-1alG*a zfySl+>eT}r@+V+*7|ZiLLUA@^GeJc@1>ne6qY zL@_(qx_pW?tzY^ zr-y3wkXSltZwIqKer~j`3>qGWlz7Bc2;0veT)!yC0dKchen^-aWl4pOO(s9I+DKGK zvVYnUT>A?ou`#^T_)tFm+*vET?^z!vA_!^gyEhTr0JhI(N_WaoTkdMfT-fo!iHc)Z z+l;rmKYSt}T>7{f6d*Z6fIraY{9*(Q!p7;CkNV@4x=N==s*)D7b0kPo&z>0hzR!&bk4^T=RKz4! zW+;N}<9>2bNxWc2g*SfbOAXj_@E1IYKQaX-Rc;CLB?qj=W~vG+m$}N07MxmkBxqTP z2sIH+Ik8;k3Y=!D+XDs0kbR5tK$dt2XMnT9WwhfKD9_E47m7ZcTMDC0SR)B|%POZ38-Q7+y!;T;{&Mb)40ZkvoufnNUJ|o#g4Ch;y|13QO;%tl+cIhUHI0FhTjeN z(&#iiS^fgfYF^zyHb-A&dz<{2erJ*QK;40mgi}K&D`COa+SNO>7jD`(I}M+@{jc8G zMeFv;U2qSeM>&{uP@XxHGKYqb#1}E_Aymi(x9zexj zYj0N)>@qq>ohzD;-ijlYFHj?t^OtESQJTgwukhrxF=U;98yF_=xaH$ffd#ir-b}BY zaB2+GvH%^LJ6RDC>BuNK@X<36mo3S^L_Ob4r08h`z5PHgZ6!vY4!p(sprzTzzY09^;^=A6U0m{QAIEE{lg4Mk1&nW8%oIwsXI; zQ)o+nHwwl<*#mxEQ&H(`%CQzH+H`c48cv)z*#uXkz6YihEARS2ZxrMJw<`KID!G_o z$}`>2WUL_Ra)?L}<1k=XrZt-CLagGC%WJy&hI%P4z9I2nIZlRapS!q$D{K~%cI*k( zn;sCDX67ZwPjO(>u*cfGsFtZY)s?OQRVwvZpYqdl4rhnAA~kGFHLCJ0aLI#hZ@8xBDsAP4fC@c9#lz)B%=-nMW(;{$KoMp2m5!B;%ONIjzQ@S@KSUYUT2L8l*o=#- zf-Qo|k_^6}9BibD_JCTh)tI|QiSrLv$Z?=6v7xrLrJz?ZkF!mS8LK!@Nae1(@K_js zIA%rl8OV{tEBuj?#CU^_tFVF(L(JkPcEibyiK%&StYDcdCPNkB>TAHY$ydcE>pA* z&kP=xLF8T;#CKow+r=)fHhA|G?>0AB5U*%-O}!W+NSo1@z%7F+tJxfv?TW{kW`XWY zy`lmiG&PE%Gs^v`(MQopEPpZIRnSq`3ZUTUZp56{aDq?#2bF=UStJnwz?G6FF=^Gw z+|*m*3KN$a6h3G=&f-jq-!Nv?>HB#7`%?!dDFkU6hAkKO?hZ{VfsptRJmulsjqAhc zXERXrFSs{0xeg^S?v}6(+QSO|cedK54{vu!#(1Y zoy==rNzuCxUeVP4`>n1HZ|g4o+@7<@wxUbiNWP&_;m=sHcSMq5u`9ct58byZOvQIW zv5@4?beiQ6-W{!|_pP7Btv1teRtnM!F*OjsF{F|hhkOh;2b6^OV|vR1fY!I#kMGkI zjDY~qal;j)1Sq;KACdFd8^BO0uPD0Md6dQaF@&o8&}P6}l+^rYUQ~BJw_&3>$1I7o zD63xScc(xeaBaOtx%}D7Oy8i~hfWtN!?<7mQ&c~8rCKPTH)>2B*7dAxv-Y8@1s7&? z#VKrU)sPl=I8b_-Bja+DYn@yQrGU-VcXUG}3xK%y^@s47^y035*gq3MX}(7D*z L9;W~w0RR92K9R9+ literal 0 HcmV?d00001