From 493083429ee96211e6aed6f6e937ad3b7afaadbd Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 27 Dec 2021 14:24:06 +0000 Subject: [PATCH] fix build git-svn-id: svn://kolibrios.org@9484 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/_old/USSR_2/1.USSR_2/1.USSR_2.asm | 2 +- skins/{_old/skin_feol_new => misc/feol}/Tupfile.lua | 0 skins/{_old/skin_feol_new => misc/feol}/base.bmp | Bin skins/{_old/skin_feol_new => misc/feol}/base_1.bmp | Bin skins/{_old/skin_feol_new => misc/feol}/build.bat | 0 skins/{_old/skin_feol_new => misc/feol}/colors.dtp | Bin skins/{_old/skin_feol_new => misc/feol}/default.asm | 0 skins/{_old/skin_feol_new => misc/feol}/left.bmp | Bin skins/{_old/skin_feol_new => misc/feol}/left_1.bmp | Bin skins/{_old/skin_feol_new => misc/feol}/oper.bmp | Bin skins/{_old/skin_feol_new => misc/feol}/oper_1.bmp | Bin skins/misc/loggy/default.asm | 2 +- skins/misc/night/night.asm | 2 +- skins/{_old => misc}/subsilv/Mistificator1.DTP | Bin skins/{_old => misc}/subsilv/Tupfile.lua | 0 skins/{_old => misc}/subsilv/active/base.bmp | Bin skins/{_old => misc}/subsilv/active/left.bmp | Bin skins/{_old => misc}/subsilv/active/oper.bmp | Bin skins/{_old => misc}/subsilv/build.bat | 0 skins/{_old => misc}/subsilv/default.asm | 0 skins/{_old => misc}/subsilv/inactive/base.bmp | Bin skins/{_old => misc}/subsilv/inactive/left.bmp | Bin skins/{_old => misc}/subsilv/inactive/oper.bmp | Bin skins/skinlist.lua | 4 ++-- 24 files changed, 5 insertions(+), 5 deletions(-) rename skins/{_old/skin_feol_new => misc/feol}/Tupfile.lua (100%) rename skins/{_old/skin_feol_new => misc/feol}/base.bmp (100%) rename skins/{_old/skin_feol_new => misc/feol}/base_1.bmp (100%) rename skins/{_old/skin_feol_new => misc/feol}/build.bat (100%) rename skins/{_old/skin_feol_new => misc/feol}/colors.dtp (100%) rename skins/{_old/skin_feol_new => misc/feol}/default.asm (100%) rename skins/{_old/skin_feol_new => misc/feol}/left.bmp (100%) rename skins/{_old/skin_feol_new => misc/feol}/left_1.bmp (100%) rename skins/{_old/skin_feol_new => misc/feol}/oper.bmp (100%) rename skins/{_old/skin_feol_new => misc/feol}/oper_1.bmp (100%) rename skins/{_old => misc}/subsilv/Mistificator1.DTP (100%) rename skins/{_old => misc}/subsilv/Tupfile.lua (100%) rename skins/{_old => misc}/subsilv/active/base.bmp (100%) rename skins/{_old => misc}/subsilv/active/left.bmp (100%) rename skins/{_old => misc}/subsilv/active/oper.bmp (100%) rename skins/{_old => misc}/subsilv/build.bat (100%) rename skins/{_old => misc}/subsilv/default.asm (100%) rename skins/{_old => misc}/subsilv/inactive/base.bmp (100%) rename skins/{_old => misc}/subsilv/inactive/left.bmp (100%) rename skins/{_old => misc}/subsilv/inactive/oper.bmp (100%) diff --git a/skins/_old/USSR_2/1.USSR_2/1.USSR_2.asm b/skins/_old/USSR_2/1.USSR_2/1.USSR_2.asm index d764dd35fa..d0c44063b1 100644 --- a/skins/_old/USSR_2/1.USSR_2/1.USSR_2.asm +++ b/skins/_old/USSR_2/1.USSR_2/1.USSR_2.asm @@ -1,4 +1,4 @@ -include '../../skin.inc' +include '../../../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/_old/skin_feol_new/Tupfile.lua b/skins/misc/feol/Tupfile.lua similarity index 100% rename from skins/_old/skin_feol_new/Tupfile.lua rename to skins/misc/feol/Tupfile.lua diff --git a/skins/_old/skin_feol_new/base.bmp b/skins/misc/feol/base.bmp similarity index 100% rename from skins/_old/skin_feol_new/base.bmp rename to skins/misc/feol/base.bmp diff --git a/skins/_old/skin_feol_new/base_1.bmp b/skins/misc/feol/base_1.bmp similarity index 100% rename from skins/_old/skin_feol_new/base_1.bmp rename to skins/misc/feol/base_1.bmp diff --git a/skins/_old/skin_feol_new/build.bat b/skins/misc/feol/build.bat similarity index 100% rename from skins/_old/skin_feol_new/build.bat rename to skins/misc/feol/build.bat diff --git a/skins/_old/skin_feol_new/colors.dtp b/skins/misc/feol/colors.dtp similarity index 100% rename from skins/_old/skin_feol_new/colors.dtp rename to skins/misc/feol/colors.dtp diff --git a/skins/_old/skin_feol_new/default.asm b/skins/misc/feol/default.asm similarity index 100% rename from skins/_old/skin_feol_new/default.asm rename to skins/misc/feol/default.asm diff --git a/skins/_old/skin_feol_new/left.bmp b/skins/misc/feol/left.bmp similarity index 100% rename from skins/_old/skin_feol_new/left.bmp rename to skins/misc/feol/left.bmp diff --git a/skins/_old/skin_feol_new/left_1.bmp b/skins/misc/feol/left_1.bmp similarity index 100% rename from skins/_old/skin_feol_new/left_1.bmp rename to skins/misc/feol/left_1.bmp diff --git a/skins/_old/skin_feol_new/oper.bmp b/skins/misc/feol/oper.bmp similarity index 100% rename from skins/_old/skin_feol_new/oper.bmp rename to skins/misc/feol/oper.bmp diff --git a/skins/_old/skin_feol_new/oper_1.bmp b/skins/misc/feol/oper_1.bmp similarity index 100% rename from skins/_old/skin_feol_new/oper_1.bmp rename to skins/misc/feol/oper_1.bmp diff --git a/skins/misc/loggy/default.asm b/skins/misc/loggy/default.asm index cd487075d7..653de830eb 100644 --- a/skins/misc/loggy/default.asm +++ b/skins/misc/loggy/default.asm @@ -1,5 +1,5 @@ include 'loggy.inc' ; Color Table -include '../skin.inc' +include '../../skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/misc/night/night.asm b/skins/misc/night/night.asm index 83b53ddafe..a3cbdbad58 100644 --- a/skins/misc/night/night.asm +++ b/skins/misc/night/night.asm @@ -1,6 +1,6 @@ ;SKIN (.SKN) - COMPILE WITH FASM -include '../skin.inc' +include '../../skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/_old/subsilv/Mistificator1.DTP b/skins/misc/subsilv/Mistificator1.DTP similarity index 100% rename from skins/_old/subsilv/Mistificator1.DTP rename to skins/misc/subsilv/Mistificator1.DTP diff --git a/skins/_old/subsilv/Tupfile.lua b/skins/misc/subsilv/Tupfile.lua similarity index 100% rename from skins/_old/subsilv/Tupfile.lua rename to skins/misc/subsilv/Tupfile.lua diff --git a/skins/_old/subsilv/active/base.bmp b/skins/misc/subsilv/active/base.bmp similarity index 100% rename from skins/_old/subsilv/active/base.bmp rename to skins/misc/subsilv/active/base.bmp diff --git a/skins/_old/subsilv/active/left.bmp b/skins/misc/subsilv/active/left.bmp similarity index 100% rename from skins/_old/subsilv/active/left.bmp rename to skins/misc/subsilv/active/left.bmp diff --git a/skins/_old/subsilv/active/oper.bmp b/skins/misc/subsilv/active/oper.bmp similarity index 100% rename from skins/_old/subsilv/active/oper.bmp rename to skins/misc/subsilv/active/oper.bmp diff --git a/skins/_old/subsilv/build.bat b/skins/misc/subsilv/build.bat similarity index 100% rename from skins/_old/subsilv/build.bat rename to skins/misc/subsilv/build.bat diff --git a/skins/_old/subsilv/default.asm b/skins/misc/subsilv/default.asm similarity index 100% rename from skins/_old/subsilv/default.asm rename to skins/misc/subsilv/default.asm diff --git a/skins/_old/subsilv/inactive/base.bmp b/skins/misc/subsilv/inactive/base.bmp similarity index 100% rename from skins/_old/subsilv/inactive/base.bmp rename to skins/misc/subsilv/inactive/base.bmp diff --git a/skins/_old/subsilv/inactive/left.bmp b/skins/misc/subsilv/inactive/left.bmp similarity index 100% rename from skins/_old/subsilv/inactive/left.bmp rename to skins/misc/subsilv/inactive/left.bmp diff --git a/skins/_old/subsilv/inactive/oper.bmp b/skins/misc/subsilv/inactive/oper.bmp similarity index 100% rename from skins/_old/subsilv/inactive/oper.bmp rename to skins/misc/subsilv/inactive/oper.bmp diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 7f299a11a0..dc0c059e56 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -22,8 +22,10 @@ skinlist = { "Leency/Workbench/Workbench.skn", "Leency/Yeah/Yeah.skn", "maxcodehack/blacky/Blacky.skn", +"misc/feol/skin_feol_new.skn", "misc/loggy/loggy.skn", "misc/night/night.skn", +"misc/subsilv/subsilv.skn", "_old/5imple Alpha/2.5imple Alpha/Simple Alpha.skn", "_old/black-glass/black-glass/black-glass.skn", "_old/black-glass/black-glass_light/black-glass_light.skn", @@ -54,14 +56,12 @@ skinlist = { "_old/Sad_grey/Sad_grey.skn", "_old/Simple_gray/Simple_gray.skn", "_old/skin_feol/skin_feol.skn", -"_old/skin_feol_new/skin_feol_new.skn", "_old/skin_ser/skin_ser.skn", "_old/skin_vhl/skin_vhl.skn", "_old/StyleVista/vista_basic/vista_basic.skn", "_old/StyleVista/vista_basic_black/vista_basic_black.skn", "_old/StyleXP/orqua/orqua.skn", "_old/StyleXP/panther/panther.skn", -"_old/subsilv/subsilv.skn", "_old/USSR/USSR.skn", "_old/USSR_2/1.USSR_2/USSR2.skn", "_old/WIN311/WIN311.skn",