diff --git a/skins/_old/mursky/Tupfile.lua b/skins/_old/mursky/Tupfile.lua index de4f265f25..1f370adb4d 100644 --- a/skins/_old/mursky/Tupfile.lua +++ b/skins/_old/mursky/Tupfile.lua @@ -1,3 +1,3 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("mursky.dtp.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mursky.dtp") -tup.rule({"mursky.asm", extra_inputs = {"mursky.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mursky.skn") +tup.rule("dtp.asm", 'fasm "%f" "%o" ', "%B") +tup.rule({"mursky.asm", extra_inputs = {"dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mursky.skn") diff --git a/skins/_old/mursky/mursky.dtp.asm b/skins/_old/mursky/dtp.asm similarity index 100% rename from skins/_old/mursky/mursky.dtp.asm rename to skins/_old/mursky/dtp.asm diff --git a/skins/_old/mursky/mursky.asm b/skins/_old/mursky/mursky.asm index c50d8fe7aa..ce712c2c8c 100644 --- a/skins/_old/mursky/mursky.asm +++ b/skins/_old/mursky/mursky.asm @@ -18,7 +18,7 @@ SKIN_PARAMS \ bouter = 0x7c92a5: \ ; border outer color bframe = 0xeaf0f5], \ ; border frame color \ - dtp = 'mursky.dtp' ; dtp colors + dtp = 'dtp' ; dtp colors SKIN_BUTTONS \ close = [-23:2][20:20], \ ; buttons coordinates @@ -32,7 +32,7 @@ SKIN_BITMAPS \ base active = bmp_base, \ base inactive = bmp_base1 -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps +BITMAP bmp_left ,'active/left.bmp' BITMAP bmp_oper ,'active/oper.bmp' BITMAP bmp_base ,'active/base.bmp' BITMAP bmp_left1,'inactive/left.bmp' diff --git a/skins/_old/testtest/Tupfile.lua b/skins/_old/testtest/Tupfile.lua index 29bb3ca201..e218b9a51d 100644 --- a/skins/_old/testtest/Tupfile.lua +++ b/skins/_old/testtest/Tupfile.lua @@ -1,3 +1,3 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("testtest.dtp.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "testtest.dtp") -tup.rule({"testtest.asm", extra_inputs = {"testtest.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "testtest.skn") +tup.rule("dtp.asm", 'fasm "%f" "%o"', "%B") +tup.rule({"testtest.asm", extra_inputs = {"dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "testtest.skn") diff --git a/skins/_old/testtest/testtest.dtp.asm b/skins/_old/testtest/dtp.asm similarity index 100% rename from skins/_old/testtest/testtest.dtp.asm rename to skins/_old/testtest/dtp.asm diff --git a/skins/_old/testtest/testtest.asm b/skins/_old/testtest/testtest.asm index d797646db2..4f46aeedee 100644 --- a/skins/_old/testtest/testtest.asm +++ b/skins/_old/testtest/testtest.asm @@ -18,11 +18,11 @@ SKIN_PARAMS \ bouter = 0x00ff00: \ ; border outer color bframe = 0xff0000], \ ; border frame color \ - dtp = 'testtest.dtp' ; dtp colors + dtp = 'dtp' ; dtp colors SKIN_BUTTONS \ close = [-23:2][20:107], \ ; buttons coordinates - minimize = [-43:2][20:107] ; [left:top][width:height] + minimize = [-43:2][20:107] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left, \ ; skin bitmaps pointers @@ -32,9 +32,9 @@ SKIN_BITMAPS \ base active = bmp_base, \ base inactive = bmp_base1 -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' +BITMAP bmp_left , 'active/left.bmp' +BITMAP bmp_oper , 'active/oper.bmp' +BITMAP bmp_base , 'active/base.bmp' +BITMAP bmp_left1, 'inactive/left.bmp' +BITMAP bmp_oper1, 'inactive/oper.bmp' +BITMAP bmp_base1, 'inactive/base.bmp'