From 4e672c79bf539e53541f6a78faecf7bfb657387d Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Mon, 19 May 2025 01:29:35 +0100
Subject: [PATCH] programs/kiv: Post-SVN clean up

- Move source code from `trunk` into program root directory.
---
 data/Tupfile.lua                            |   2 +-
 programs/build_all.bat                      |   2 +-
 programs/media/kiv/{trunk => }/Tupfile.lua  |   2 +-
 programs/media/kiv/{trunk => }/kiv.asm      |   0
 programs/media/kiv/{trunk => }/kivicons.bmp | Bin
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename programs/media/kiv/{trunk => }/Tupfile.lua (71%)
 rename programs/media/kiv/{trunk => }/kiv.asm (100%)
 rename programs/media/kiv/{trunk => }/kivicons.bmp (100%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 62651ccb6..d21ea7182 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -525,7 +525,7 @@ tup.append_table(img_files, {
  {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
  {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
- {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"},
+ {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},
  {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"},
  {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"},
  {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 75467156a..38ec1cbe2 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -231,7 +231,7 @@ echo *
 echo Building depend application for fdd's nightbuild
 echo *
 echo __nightbuild fix yes >> config.inc
-fasm media\kiv\trunk\kiv.asm %BIN%\nightbuild\kiv
+fasm media\kiv\kiv.asm %BIN%\nightbuild\kiv
 fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot
 fasm media\animage\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
diff --git a/programs/media/kiv/trunk/Tupfile.lua b/programs/media/kiv/Tupfile.lua
similarity index 71%
rename from programs/media/kiv/trunk/Tupfile.lua
rename to programs/media/kiv/Tupfile.lua
index 23892ceeb..206f4d110 100644
--- a/programs/media/kiv/trunk/Tupfile.lua
+++ b/programs/media/kiv/Tupfile.lua
@@ -1,5 +1,5 @@
 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")
 
 add_include(HELPERDIR .. "/develop/libraries/libs-dev/libimg")
diff --git a/programs/media/kiv/trunk/kiv.asm b/programs/media/kiv/kiv.asm
similarity index 100%
rename from programs/media/kiv/trunk/kiv.asm
rename to programs/media/kiv/kiv.asm
diff --git a/programs/media/kiv/trunk/kivicons.bmp b/programs/media/kiv/kivicons.bmp
similarity index 100%
rename from programs/media/kiv/trunk/kivicons.bmp
rename to programs/media/kiv/kivicons.bmp