diff --git a/data/Tupfile.lua b/data/Tupfile.lua index e6635042d..8c8d302e5 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -428,7 +428,7 @@ tup.append_table(img_files, { {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"}, {"LAUNCHER", VAR_PROGS .. "/system/launcher/trunk/launcher"}, {"LOADDRV", VAR_PROGS .. "/system/loaddrv/loaddrv"}, - {"MAGNIFY", VAR_PROGS .. "/demos/magnify/trunk/magnify"}, + {"MAGNIFY", VAR_PROGS .. "/system/magnify/magnify"}, {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"}, {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/trunk/mousemul"}, {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"}, diff --git a/programs/demos/magnify/trunk/Tupfile.lua b/programs/system/magnify/Tupfile.lua similarity index 69% rename from programs/demos/magnify/trunk/Tupfile.lua rename to programs/system/magnify/Tupfile.lua index c84d51e13..11f6399e6 100644 --- a/programs/demos/magnify/trunk/Tupfile.lua +++ b/programs/system/magnify/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") tup.rule("magnify.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "%B") diff --git a/programs/demos/magnify/trunk/magnify.asm b/programs/system/magnify/magnify.asm similarity index 98% rename from programs/demos/magnify/trunk/magnify.asm rename to programs/system/magnify/magnify.asm index c694c44b9..129083dcc 100644 --- a/programs/demos/magnify/trunk/magnify.asm +++ b/programs/system/magnify/magnify.asm @@ -19,9 +19,9 @@ dd 0, 0 ;--------------------------------------------------------------------- -include '../../../macros.inc' -include "../../../KOSfuncs.inc" -include "../../../encoding.inc" +include '../../macros.inc' +include "../../KOSfuncs.inc" +include "../../encoding.inc" ;---------------------------------------------------------------------