From 38f7d72837fde76dc7f4b43744178d254062d582 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Sun, 1 Jun 2025 00:09:44 +0100
Subject: [PATCH] media/midiplay: Post-SVN tidy

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

diff --git a/programs/build_all.bat b/programs/build_all.bat
index 191d0abdd..c86d8edc0 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -169,7 +169,7 @@ fasm media\gifview\trunk\gifview.asm %BIN%\gifview
 fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
 fasm media\jpegview\trunk\jpegview.asm %BIN%\jpegview
 fasm media\midamp\midamp.asm %BIN%\midamp
-fasm media\midiplay\trunk\midiplay.asm %BIN%\midiplay
+fasm media\midiplay\midiplay.asm %BIN%\midiplay
 fasm media\mixer\trunk\mixer.asm %BIN%\mixer
 
 fasm media\mv\trunk\mv.asm %BIN%\mv
diff --git a/programs/media/midiplay/trunk/Tupfile.lua b/programs/media/midiplay/Tupfile.lua
similarity index 79%
rename from programs/media/midiplay/trunk/Tupfile.lua
rename to programs/media/midiplay/Tupfile.lua
index 3492c8c23..cfee659f1 100644
--- a/programs/media/midiplay/trunk/Tupfile.lua
+++ b/programs/media/midiplay/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/media/midiplay/trunk/build_en.bat b/programs/media/midiplay/build_en.bat
similarity index 100%
rename from programs/media/midiplay/trunk/build_en.bat
rename to programs/media/midiplay/build_en.bat
diff --git a/programs/media/midiplay/trunk/build_ru.bat b/programs/media/midiplay/build_ru.bat
similarity index 100%
rename from programs/media/midiplay/trunk/build_ru.bat
rename to programs/media/midiplay/build_ru.bat
diff --git a/programs/media/midiplay/trunk/midiplay.asm b/programs/media/midiplay/midiplay.asm
similarity index 98%
rename from programs/media/midiplay/trunk/midiplay.asm
rename to programs/media/midiplay/midiplay.asm
index 809d2e62b..a9b9d56d9 100644
--- a/programs/media/midiplay/trunk/midiplay.asm
+++ b/programs/media/midiplay/midiplay.asm
@@ -1,9 +1,12 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;    Ok, this is the sceleton that MENUET 0.01 understands.
 ;    Do not change the header bits for now. Compile with nasm.
 ;
 
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 
 use32
  org    0x0
@@ -295,6 +298,3 @@ errorlen2:
 base db 0x0
 
 I_END:
-
-
-