From 4ee28966f885a75ec09d45fc1efb090f690c52b4 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 23 Nov 2020 17:16:20 +0000 Subject: [PATCH] fpc fix examples folder, remove 2 old skins of mine git-svn-id: svn://kolibrios.org@8244 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- skins/Leency/Blueberries/Tupfile.lua | 2 -- skins/Leency/Blueberries/build.bat | 4 --- skins/Leency/Blueberries/center1.bmp | Bin 150 -> 0 bytes skins/Leency/Blueberries/center2.bmp | Bin 150 -> 0 bytes skins/Leency/Blueberries/default.asm | 31 ----------------------- skins/Leency/Blueberries/default.dtp | Bin 40 -> 0 bytes skins/Leency/Blueberries/default.dtp.asm | 14 ---------- skins/Leency/Blueberries/left1.bmp | Bin 150 -> 0 bytes skins/Leency/Blueberries/left2.bmp | Bin 150 -> 0 bytes skins/Leency/Blueberries/right1.bmp | Bin 4278 -> 0 bytes skins/Leency/Blueberries/right2.bmp | Bin 4278 -> 0 bytes skins/_old/Leency/Octo/Tupfile.lua | 2 -- skins/_old/Leency/Octo/build.bat | 3 --- skins/_old/Leency/Octo/center1.bmp | Bin 138 -> 0 bytes skins/_old/Leency/Octo/center2.bmp | Bin 138 -> 0 bytes skins/_old/Leency/Octo/default.asm | 31 ----------------------- skins/_old/Leency/Octo/default.dtp | Bin 40 -> 0 bytes skins/_old/Leency/Octo/left1.bmp | Bin 222 -> 0 bytes skins/_old/Leency/Octo/left2.bmp | Bin 222 -> 0 bytes skins/_old/Leency/Octo/right1.bmp | Bin 2238 -> 0 bytes skins/_old/Leency/Octo/right2.bmp | Bin 2322 -> 0 bytes skins/skinlist.lua | 2 -- 23 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 skins/Leency/Blueberries/Tupfile.lua delete mode 100644 skins/Leency/Blueberries/build.bat delete mode 100644 skins/Leency/Blueberries/center1.bmp delete mode 100644 skins/Leency/Blueberries/center2.bmp delete mode 100644 skins/Leency/Blueberries/default.asm delete mode 100644 skins/Leency/Blueberries/default.dtp delete mode 100644 skins/Leency/Blueberries/default.dtp.asm delete mode 100644 skins/Leency/Blueberries/left1.bmp delete mode 100644 skins/Leency/Blueberries/left2.bmp delete mode 100644 skins/Leency/Blueberries/right1.bmp delete mode 100644 skins/Leency/Blueberries/right2.bmp delete mode 100644 skins/_old/Leency/Octo/Tupfile.lua delete mode 100644 skins/_old/Leency/Octo/build.bat delete mode 100644 skins/_old/Leency/Octo/center1.bmp delete mode 100644 skins/_old/Leency/Octo/center2.bmp delete mode 100644 skins/_old/Leency/Octo/default.asm delete mode 100644 skins/_old/Leency/Octo/default.dtp delete mode 100644 skins/_old/Leency/Octo/left1.bmp delete mode 100644 skins/_old/Leency/Octo/left2.bmp delete mode 100644 skins/_old/Leency/Octo/right1.bmp delete mode 100644 skins/_old/Leency/Octo/right2.bmp diff --git a/data/Tupfile.lua b/data/Tupfile.lua index b9f6a7fa70..e87623858b 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -168,7 +168,7 @@ extra_files = { {"kolibrios/3D/TEXT_2.PNG", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/text_2.png"}, {"kolibrios/develop/c--/", PROGS .. "/cmm/c--/*"}, {"kolibrios/develop/fpc/", "common/develop/fpc/*"}, - {"kolibrios/develop/fpc/examples/", PROGS .. "/develop/fp/examples/*"}, + {"kolibrios/develop/fpc/examples/", PROGS .. "/develop/fp/examples/src/*"}, {"kolibrios/develop/fpc/examples/build.sh", "common/develop/fpc/build.sh"}, {"kolibrios/develop/lua/lua", "../contrib/other/lua-5.2.0/lua"}, {"kolibrios/develop/lua/calc.lua", "../contrib/other/lua-5.2.0/calc.lua"}, diff --git a/skins/Leency/Blueberries/Tupfile.lua b/skins/Leency/Blueberries/Tupfile.lua deleted file mode 100644 index f5c9e0e095..0000000000 --- a/skins/Leency/Blueberries/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Blueberries.skn") diff --git a/skins/Leency/Blueberries/build.bat b/skins/Leency/Blueberries/build.bat deleted file mode 100644 index 4da7975657..0000000000 --- a/skins/Leency/Blueberries/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -@fasm default.dtp.asm default.dtp -@fasm default.asm default.skn -@kpack default.skn -@pause \ No newline at end of file diff --git a/skins/Leency/Blueberries/center1.bmp b/skins/Leency/Blueberries/center1.bmp deleted file mode 100644 index c25dca62397d206f9952808d72b1df4b7c0e2938..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW0zW diff --git a/skins/Leency/Blueberries/center2.bmp b/skins/Leency/Blueberries/center2.bmp deleted file mode 100644 index 3dcff5a2430215d25b79b9126af9c8abaf9a9003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 ucmZ?royGtGW=^*OgTk4 z??A~o;PB5-cGDjp)rD1in>Wr=!uJ916W#*eobxrNcizVmKb3MZLoue+sAVPS>)rQ? zx8?LV6T?dr>-rA*J;i{kNCOJMOW(tOH=BN{WIP%IuMWKXp06kE{^Di>6E-}tzC@G9 z{VQ^pfQjefx$+noiIjD$FVWygr%=#}gvk0feBnrKxh`&^=hsX_En()Lcou=7ex4O u)=QPJuL=zi0(M&sMEL$}Rw`j%6&fHxzJI?*#h?p{G@t;y>@OCw5@Sx16<@jl diff --git a/skins/Leency/Blueberries/right2.bmp b/skins/Leency/Blueberries/right2.bmp deleted file mode 100644 index 5a54fe6c194747058a66b6137f861c8a5326bc46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4278 zcmeH}Jqp4=5JuM;yWthNYw_J} z7Aj$16&fHG-@|^b682T00b=oW4_lS6uL=zii|^6htAu@3Xn;idKJGWg;Qv>V22|*O J9SeDhF;C(Ncy0gy diff --git a/skins/_old/Leency/Octo/Tupfile.lua b/skins/_old/Leency/Octo/Tupfile.lua deleted file mode 100644 index 7292022faf..0000000000 --- a/skins/_old/Leency/Octo/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Octo.skn") diff --git a/skins/_old/Leency/Octo/build.bat b/skins/_old/Leency/Octo/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/_old/Leency/Octo/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/_old/Leency/Octo/center1.bmp b/skins/_old/Leency/Octo/center1.bmp deleted file mode 100644 index bd3913a83ca59ed1a39d54a4444aa093c5ff4081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmXwqK?(vP005_Rw;<@)u^04!ZXNnWY@g{}$|8b@2#bgy3+fxZWi1WN%R=);GepFx3RD$i47~pyA1XNP diff --git a/skins/_old/Leency/Octo/default.asm b/skins/_old/Leency/Octo/default.asm deleted file mode 100644 index fe53274dce..0000000000 --- a/skins/_old/Leency/Octo/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '..\skin.inc' - -SKIN_PARAMS \ - height = bmp_center1.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xE1E1E1:\ ; border inner color - bouter=0x204962:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0xA1A1A1:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:3][14:14],\ ; buttons coordinates - minimize = [-37:3][14:14] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers - left inactive = bmp_left2,\ - oper active = bmp_right1,\ - oper inactive = bmp_right2,\ - base active = bmp_center1,\ - base inactive = bmp_center2 - -BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps -BITMAP bmp_left2, 'left2.bmp' -BITMAP bmp_right1, 'right1.bmp' -BITMAP bmp_right2, 'right2.bmp' -BITMAP bmp_center1,'center1.bmp' -BITMAP bmp_center2,'center2.bmp' diff --git a/skins/_old/Leency/Octo/default.dtp b/skins/_old/Leency/Octo/default.dtp deleted file mode 100644 index 5a62f2e7a1c40c02e9301c5021bc90907f12385d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 scmca|D58j>!!D;$7yk22@9puS-)+p5 zJ8~!PKxbZ}H}-#?_seVFiC7^7lu|;a6x3QnV+^#`LgyUx-op?Aj4{HL63jWnQVOiK U!qyt>y~8mEoO8mp7Ub86zE2oQD*ylh diff --git a/skins/_old/Leency/Octo/left2.bmp b/skins/_old/Leency/Octo/left2.bmp deleted file mode 100644 index 575d5e477088d5d6a2676e859f6c1f81fd326da2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 ycmZ?ry~h9nWEp*iNduk6zyJV%sbj?e diff --git a/skins/_old/Leency/Octo/right1.bmp b/skins/_old/Leency/Octo/right1.bmp deleted file mode 100644 index 6daaefb6585d99f34d5656f30366a67ae637432b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmchXze~eF6vxlae?V|-Ern82NB;mP7ypPt9UR=;T%5$sKR|GFcM>EXM$<+Sq&C&I zNlI!=f6!7|N=xhJmv=>^y$T)95APoDy}aBvxw~Y0m#;En3qFCdfw6|M!q(v#JDpyq zWa{=Z8P%5Fi7;j=#&uoN$ttE=t&)zV7~l6v=SeZOT8(s`6%zyj>AWltmg0kWBSeg% zbfz#2NhhDrzs`Z86w#Q=eI^o?l?&^{qg6)=FTDjVq=QF#p94kPwhIf0MlUtZO(u(` z8Dz5o0;DKP+ndcM>0tfvYBQh+?cxINjdCn@l}h=V=D`pkH6I*ld#lwVotxuB>*Q$0 zP^?rcr3HANXWW(W4x5_|7y`p6qbO}}x7(z1wx2#f$jlguj^jW|3YLO%_qPt`9*WZD zPNzdU_%8rF%@3mThu8HA_5{lnk6*(OAm!YV-qP)MNeBOhWfA89d%|yR7y@w)r1SK8 zJ<`GVx-7b0h(s=Q-NtbN2t+EKr{C|Bj_6hA2ZI6Wh;L1u9}b74(@@N4G$I|GN2QF% SW77Fj%w#el9k_om#=ZdpSw-9c diff --git a/skins/_old/Leency/Octo/right2.bmp b/skins/_old/Leency/Octo/right2.bmp deleted file mode 100644 index aa31033e70c89767d265bfcd3b39c9b546e70077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2322 zcmc(hy-vbV6vykPtBHxbi%;MKxVy73kr)=k#y|*h@j-kU5L!%V!HE|70sVj)>gMLp zHeQOCm^7q#^1qjJPH)eTdv4S8_U`;lN$rODnsLRrV4NtI%!)ESO@DT#=VKYv`D|9U zK9YnD9hqg%=VeRm%dzdU^)D>faf-@w-6#y-<9HQC_y}jS*<_(yP3$XMTxbr1z%YzP zqhaVeKAMcjgm05c^h3`VJcJblLA6?KwOY+)b2J+1x{gCga0?B#z^S=gDHRrmD4Ct=(>ez;Fm(heLn4l-CQEWm%n0=Seb>a4EZ2uIs9U z0hGtoa8y-=vUjmynbT>#UVo5`Bs<=FFMpm^P(07lG>s&e*fuK4(Ph?o-1dRMi3JA+Hy#!1s%awr9@