From e1eda2ae347ca778567f0fec60b614d3b48d21c5 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Sun, 3 Aug 2025 22:05:01 +0100
Subject: [PATCH] outdated/iconedit: Post-SVN tidy

- Move source code from `trunk` into root directory.
- Update build files and ASM include paths.
---
 programs/build_all.bat                                    | 4 ++--
 programs/other/outdated/iconedit/{trunk => }/Tupfile.lua  | 2 +-
 programs/other/outdated/iconedit/{trunk => }/build_en.bat | 0
 programs/other/outdated/iconedit/{trunk => }/build_ru.bat | 0
 programs/other/outdated/iconedit/{trunk => }/iconedit.asm | 5 ++++-
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename programs/other/outdated/iconedit/{trunk => }/Tupfile.lua (79%)
 rename programs/other/outdated/iconedit/{trunk => }/build_en.bat (100%)
 rename programs/other/outdated/iconedit/{trunk => }/build_ru.bat (100%)
 rename programs/other/outdated/iconedit/{trunk => }/iconedit.asm (99%)

diff --git a/programs/build_all.bat b/programs/build_all.bat
index dd2660c4b..d94dfc6b2 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -166,7 +166,7 @@ rem media\ac97snd\trunk\ac97snd.asm ac97snd
 fasm media\animage\animage.asm %BIN%\animage
 fasm media\cdp\trunk\cdp.asm %BIN%\cdp
 rem fasm media\gifview\trunk\gifview.asm %BIN%\gifview
-fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
+rem fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
 fasm media\jpegview\trunk\jpegview.asm %BIN%\jpegview
 fasm media\midamp\trunk\midamp.asm %BIN%\midamp
 fasm media\midiplay\trunk\midiplay.asm %BIN%\midiplay
@@ -378,7 +378,7 @@ echo *
 kpack %BIN%\animage
 kpack %BIN%\cdp
 rem kpack %BIN%\gifview
-kpack %BIN%\iconedit
+rem kpack %BIN%\iconedit
 kpack %BIN%\jpegview
 kpack %BIN%\midamp
 kpack %BIN%\midiplay
diff --git a/programs/other/outdated/iconedit/trunk/Tupfile.lua b/programs/other/outdated/iconedit/Tupfile.lua
similarity index 79%
rename from programs/other/outdated/iconedit/trunk/Tupfile.lua
rename to programs/other/outdated/iconedit/Tupfile.lua
index d7c0e779e..16c245508 100644
--- a/programs/other/outdated/iconedit/trunk/Tupfile.lua
+++ b/programs/other/outdated/iconedit/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(tup.getvariantdir())
 
diff --git a/programs/other/outdated/iconedit/trunk/build_en.bat b/programs/other/outdated/iconedit/build_en.bat
similarity index 100%
rename from programs/other/outdated/iconedit/trunk/build_en.bat
rename to programs/other/outdated/iconedit/build_en.bat
diff --git a/programs/other/outdated/iconedit/trunk/build_ru.bat b/programs/other/outdated/iconedit/build_ru.bat
similarity index 100%
rename from programs/other/outdated/iconedit/trunk/build_ru.bat
rename to programs/other/outdated/iconedit/build_ru.bat
diff --git a/programs/other/outdated/iconedit/trunk/iconedit.asm b/programs/other/outdated/iconedit/iconedit.asm
similarity index 99%
rename from programs/other/outdated/iconedit/trunk/iconedit.asm
rename to programs/other/outdated/iconedit/iconedit.asm
index 0bc1a95c4..9c76172d7 100644
--- a/programs/other/outdated/iconedit/trunk/iconedit.asm
+++ b/programs/other/outdated/iconedit/iconedit.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;   Modified from original icon editor
 ;
@@ -14,7 +17,7 @@
    dd     0x0 , 0x0               ; I_Param , I_Icon
 
 include 'lang.inc'
-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'
 
 window_x_size  equ    346
 window_y_size  equ    312