From a5e72d7ea44c7177d45110b8050860a638831c54 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 18 May 2025 23:59:00 +0100 Subject: [PATCH] programs/PrMK: Post-SVN clean up - Move source code from `trunk` into program root directory. --- programs/emulator/PrMK/{trunk => }/MASMFpuLib.asm | 0 .../emulator/PrMK/{trunk => }/MK_b3-34_hand.bmp | Bin programs/emulator/PrMK/{trunk => }/PrMK.asm | 0 programs/emulator/PrMK/{trunk => }/Tupfile.lua | 0 .../PrMK/{trunk => }/docs/Calculator games.txt | 0 .../docs/Electronica MK-152 RE commands list.htm | 0 ...calculator BZ-34 MK-54 MK-56 commands system.htm | 0 .../emulator/PrMK/{trunk => }/docs/b3-34help0.htm | 0 .../emulator/PrMK/{trunk => }/docs/b3-34help1.htm | 0 .../emulator/PrMK/{trunk => }/docs/b3-34help2.htm | 0 .../emulator/PrMK/{trunk => }/docs/com_b334.jpg | Bin .../emulator/PrMK/{trunk => }/docs/danilov1.jpg | Bin .../emulator/PrMK/{trunk => }/docs/nkj12840.jpg | Bin .../emulator/PrMK/{trunk => }/docs/stack000.jpg | Bin programs/emulator/PrMK/{trunk => }/docs/stack1.png | Bin programs/emulator/PrMK/{trunk => }/docs/stack2.png | Bin programs/emulator/PrMK/{trunk => }/docs/stack3.png | Bin programs/emulator/PrMK/{trunk => }/docs/stack4.png | Bin programs/emulator/PrMK/{trunk => }/docs/stack5.png | Bin programs/emulator/PrMK/{trunk => }/docs/stack6.png | Bin programs/emulator/PrMK/{trunk => }/docs/stack7.png | Bin .../emulator/PrMK/{trunk => }/docs/tablb334.jpg | Bin programs/emulator/PrMK/{trunk => }/editbox_ex.mac | 0 programs/emulator/PrMK/{trunk => }/load_lib.mac | 0 programs/emulator/PrMK/{trunk => }/macroPRMK.inc | 0 programs/emulator/PrMK/{trunk => }/opcodes.inc | 0 programs/emulator/PrMK/{trunk => }/readme.txt | 0 programs/emulator/PrMK/{trunk => }/smpl/1.MKP | Bin programs/emulator/PrMK/{trunk => }/smpl/1.mkp.asm | 0 programs/emulator/PrMK/{trunk => }/smpl/2.MKP | Bin programs/emulator/PrMK/{trunk => }/smpl/2.mkp.asm | 0 programs/emulator/PrMK/{trunk => }/smpl/3.MKP | Bin programs/emulator/PrMK/{trunk => }/smpl/3.mkp.asm | 0 programs/emulator/e80/Tupfile.lua | 2 +- 34 files changed, 1 insertion(+), 1 deletion(-) rename programs/emulator/PrMK/{trunk => }/MASMFpuLib.asm (100%) rename programs/emulator/PrMK/{trunk => }/MK_b3-34_hand.bmp (100%) rename programs/emulator/PrMK/{trunk => }/PrMK.asm (100%) rename programs/emulator/PrMK/{trunk => }/Tupfile.lua (100%) rename programs/emulator/PrMK/{trunk => }/docs/Calculator games.txt (100%) rename programs/emulator/PrMK/{trunk => }/docs/Electronica MK-152 RE commands list.htm (100%) rename programs/emulator/PrMK/{trunk => }/docs/Programmable calculator BZ-34 MK-54 MK-56 commands system.htm (100%) rename programs/emulator/PrMK/{trunk => }/docs/b3-34help0.htm (100%) rename programs/emulator/PrMK/{trunk => }/docs/b3-34help1.htm (100%) rename programs/emulator/PrMK/{trunk => }/docs/b3-34help2.htm (100%) rename programs/emulator/PrMK/{trunk => }/docs/com_b334.jpg (100%) rename programs/emulator/PrMK/{trunk => }/docs/danilov1.jpg (100%) rename programs/emulator/PrMK/{trunk => }/docs/nkj12840.jpg (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack000.jpg (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack1.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack2.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack3.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack4.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack5.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack6.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/stack7.png (100%) rename programs/emulator/PrMK/{trunk => }/docs/tablb334.jpg (100%) rename programs/emulator/PrMK/{trunk => }/editbox_ex.mac (100%) rename programs/emulator/PrMK/{trunk => }/load_lib.mac (100%) rename programs/emulator/PrMK/{trunk => }/macroPRMK.inc (100%) rename programs/emulator/PrMK/{trunk => }/opcodes.inc (100%) rename programs/emulator/PrMK/{trunk => }/readme.txt (100%) rename programs/emulator/PrMK/{trunk => }/smpl/1.MKP (100%) rename programs/emulator/PrMK/{trunk => }/smpl/1.mkp.asm (100%) rename programs/emulator/PrMK/{trunk => }/smpl/2.MKP (100%) rename programs/emulator/PrMK/{trunk => }/smpl/2.mkp.asm (100%) rename programs/emulator/PrMK/{trunk => }/smpl/3.MKP (100%) rename programs/emulator/PrMK/{trunk => }/smpl/3.mkp.asm (100%) diff --git a/programs/emulator/PrMK/trunk/MASMFpuLib.asm b/programs/emulator/PrMK/MASMFpuLib.asm similarity index 100% rename from programs/emulator/PrMK/trunk/MASMFpuLib.asm rename to programs/emulator/PrMK/MASMFpuLib.asm diff --git a/programs/emulator/PrMK/trunk/MK_b3-34_hand.bmp b/programs/emulator/PrMK/MK_b3-34_hand.bmp similarity index 100% rename from programs/emulator/PrMK/trunk/MK_b3-34_hand.bmp rename to programs/emulator/PrMK/MK_b3-34_hand.bmp diff --git a/programs/emulator/PrMK/trunk/PrMK.asm b/programs/emulator/PrMK/PrMK.asm similarity index 100% rename from programs/emulator/PrMK/trunk/PrMK.asm rename to programs/emulator/PrMK/PrMK.asm diff --git a/programs/emulator/PrMK/trunk/Tupfile.lua b/programs/emulator/PrMK/Tupfile.lua similarity index 100% rename from programs/emulator/PrMK/trunk/Tupfile.lua rename to programs/emulator/PrMK/Tupfile.lua diff --git a/programs/emulator/PrMK/trunk/docs/Calculator games.txt b/programs/emulator/PrMK/docs/Calculator games.txt similarity index 100% rename from programs/emulator/PrMK/trunk/docs/Calculator games.txt rename to programs/emulator/PrMK/docs/Calculator games.txt diff --git a/programs/emulator/PrMK/trunk/docs/Electronica MK-152 RE commands list.htm b/programs/emulator/PrMK/docs/Electronica MK-152 RE commands list.htm similarity index 100% rename from programs/emulator/PrMK/trunk/docs/Electronica MK-152 RE commands list.htm rename to programs/emulator/PrMK/docs/Electronica MK-152 RE commands list.htm diff --git a/programs/emulator/PrMK/trunk/docs/Programmable calculator BZ-34 MK-54 MK-56 commands system.htm b/programs/emulator/PrMK/docs/Programmable calculator BZ-34 MK-54 MK-56 commands system.htm similarity index 100% rename from programs/emulator/PrMK/trunk/docs/Programmable calculator BZ-34 MK-54 MK-56 commands system.htm rename to programs/emulator/PrMK/docs/Programmable calculator BZ-34 MK-54 MK-56 commands system.htm diff --git a/programs/emulator/PrMK/trunk/docs/b3-34help0.htm b/programs/emulator/PrMK/docs/b3-34help0.htm similarity index 100% rename from programs/emulator/PrMK/trunk/docs/b3-34help0.htm rename to programs/emulator/PrMK/docs/b3-34help0.htm diff --git a/programs/emulator/PrMK/trunk/docs/b3-34help1.htm b/programs/emulator/PrMK/docs/b3-34help1.htm similarity index 100% rename from programs/emulator/PrMK/trunk/docs/b3-34help1.htm rename to programs/emulator/PrMK/docs/b3-34help1.htm diff --git a/programs/emulator/PrMK/trunk/docs/b3-34help2.htm b/programs/emulator/PrMK/docs/b3-34help2.htm similarity index 100% rename from programs/emulator/PrMK/trunk/docs/b3-34help2.htm rename to programs/emulator/PrMK/docs/b3-34help2.htm diff --git a/programs/emulator/PrMK/trunk/docs/com_b334.jpg b/programs/emulator/PrMK/docs/com_b334.jpg similarity index 100% rename from programs/emulator/PrMK/trunk/docs/com_b334.jpg rename to programs/emulator/PrMK/docs/com_b334.jpg diff --git a/programs/emulator/PrMK/trunk/docs/danilov1.jpg b/programs/emulator/PrMK/docs/danilov1.jpg similarity index 100% rename from programs/emulator/PrMK/trunk/docs/danilov1.jpg rename to programs/emulator/PrMK/docs/danilov1.jpg diff --git a/programs/emulator/PrMK/trunk/docs/nkj12840.jpg b/programs/emulator/PrMK/docs/nkj12840.jpg similarity index 100% rename from programs/emulator/PrMK/trunk/docs/nkj12840.jpg rename to programs/emulator/PrMK/docs/nkj12840.jpg diff --git a/programs/emulator/PrMK/trunk/docs/stack000.jpg b/programs/emulator/PrMK/docs/stack000.jpg similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack000.jpg rename to programs/emulator/PrMK/docs/stack000.jpg diff --git a/programs/emulator/PrMK/trunk/docs/stack1.png b/programs/emulator/PrMK/docs/stack1.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack1.png rename to programs/emulator/PrMK/docs/stack1.png diff --git a/programs/emulator/PrMK/trunk/docs/stack2.png b/programs/emulator/PrMK/docs/stack2.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack2.png rename to programs/emulator/PrMK/docs/stack2.png diff --git a/programs/emulator/PrMK/trunk/docs/stack3.png b/programs/emulator/PrMK/docs/stack3.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack3.png rename to programs/emulator/PrMK/docs/stack3.png diff --git a/programs/emulator/PrMK/trunk/docs/stack4.png b/programs/emulator/PrMK/docs/stack4.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack4.png rename to programs/emulator/PrMK/docs/stack4.png diff --git a/programs/emulator/PrMK/trunk/docs/stack5.png b/programs/emulator/PrMK/docs/stack5.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack5.png rename to programs/emulator/PrMK/docs/stack5.png diff --git a/programs/emulator/PrMK/trunk/docs/stack6.png b/programs/emulator/PrMK/docs/stack6.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack6.png rename to programs/emulator/PrMK/docs/stack6.png diff --git a/programs/emulator/PrMK/trunk/docs/stack7.png b/programs/emulator/PrMK/docs/stack7.png similarity index 100% rename from programs/emulator/PrMK/trunk/docs/stack7.png rename to programs/emulator/PrMK/docs/stack7.png diff --git a/programs/emulator/PrMK/trunk/docs/tablb334.jpg b/programs/emulator/PrMK/docs/tablb334.jpg similarity index 100% rename from programs/emulator/PrMK/trunk/docs/tablb334.jpg rename to programs/emulator/PrMK/docs/tablb334.jpg diff --git a/programs/emulator/PrMK/trunk/editbox_ex.mac b/programs/emulator/PrMK/editbox_ex.mac similarity index 100% rename from programs/emulator/PrMK/trunk/editbox_ex.mac rename to programs/emulator/PrMK/editbox_ex.mac diff --git a/programs/emulator/PrMK/trunk/load_lib.mac b/programs/emulator/PrMK/load_lib.mac similarity index 100% rename from programs/emulator/PrMK/trunk/load_lib.mac rename to programs/emulator/PrMK/load_lib.mac diff --git a/programs/emulator/PrMK/trunk/macroPRMK.inc b/programs/emulator/PrMK/macroPRMK.inc similarity index 100% rename from programs/emulator/PrMK/trunk/macroPRMK.inc rename to programs/emulator/PrMK/macroPRMK.inc diff --git a/programs/emulator/PrMK/trunk/opcodes.inc b/programs/emulator/PrMK/opcodes.inc similarity index 100% rename from programs/emulator/PrMK/trunk/opcodes.inc rename to programs/emulator/PrMK/opcodes.inc diff --git a/programs/emulator/PrMK/trunk/readme.txt b/programs/emulator/PrMK/readme.txt similarity index 100% rename from programs/emulator/PrMK/trunk/readme.txt rename to programs/emulator/PrMK/readme.txt diff --git a/programs/emulator/PrMK/trunk/smpl/1.MKP b/programs/emulator/PrMK/smpl/1.MKP similarity index 100% rename from programs/emulator/PrMK/trunk/smpl/1.MKP rename to programs/emulator/PrMK/smpl/1.MKP diff --git a/programs/emulator/PrMK/trunk/smpl/1.mkp.asm b/programs/emulator/PrMK/smpl/1.mkp.asm similarity index 100% rename from programs/emulator/PrMK/trunk/smpl/1.mkp.asm rename to programs/emulator/PrMK/smpl/1.mkp.asm diff --git a/programs/emulator/PrMK/trunk/smpl/2.MKP b/programs/emulator/PrMK/smpl/2.MKP similarity index 100% rename from programs/emulator/PrMK/trunk/smpl/2.MKP rename to programs/emulator/PrMK/smpl/2.MKP diff --git a/programs/emulator/PrMK/trunk/smpl/2.mkp.asm b/programs/emulator/PrMK/smpl/2.mkp.asm similarity index 100% rename from programs/emulator/PrMK/trunk/smpl/2.mkp.asm rename to programs/emulator/PrMK/smpl/2.mkp.asm diff --git a/programs/emulator/PrMK/trunk/smpl/3.MKP b/programs/emulator/PrMK/smpl/3.MKP similarity index 100% rename from programs/emulator/PrMK/trunk/smpl/3.MKP rename to programs/emulator/PrMK/smpl/3.MKP diff --git a/programs/emulator/PrMK/trunk/smpl/3.mkp.asm b/programs/emulator/PrMK/smpl/3.mkp.asm similarity index 100% rename from programs/emulator/PrMK/trunk/smpl/3.mkp.asm rename to programs/emulator/PrMK/smpl/3.mkp.asm diff --git a/programs/emulator/e80/Tupfile.lua b/programs/emulator/e80/Tupfile.lua index 9d008dfa8..524401f10 100644 --- a/programs/emulator/e80/Tupfile.lua +++ b/programs/emulator/e80/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_GCC") ~= "" 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_gcc.lua") INCLUDES = INCLUDES .. "-I" .. tup.getvariantdir() LDFLAGS = LDFLAGS .. " -T kolibri.ld"