From 51799b474a364365d54913281761cd1dfdb1c70d Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Fri, 23 May 2025 00:11:11 +0100
Subject: [PATCH] develop/examples/example2: Post-SVN tidy

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

diff --git a/programs/develop/examples/example2/trunk/Tupfile.lua b/programs/develop/examples/example2/Tupfile.lua
similarity index 79%
rename from programs/develop/examples/example2/trunk/Tupfile.lua
rename to programs/develop/examples/example2/Tupfile.lua
index 15dc7cacd..b5b1bc484 100644
--- a/programs/develop/examples/example2/trunk/Tupfile.lua
+++ b/programs/develop/examples/example2/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/develop/examples/example2/trunk/build_en.bat b/programs/develop/examples/example2/build_en.bat
similarity index 100%
rename from programs/develop/examples/example2/trunk/build_en.bat
rename to programs/develop/examples/example2/build_en.bat
diff --git a/programs/develop/examples/example2/trunk/build_ru.bat b/programs/develop/examples/example2/build_ru.bat
similarity index 100%
rename from programs/develop/examples/example2/trunk/build_ru.bat
rename to programs/develop/examples/example2/build_ru.bat
diff --git a/programs/develop/examples/example2/trunk/dialogs1.inc b/programs/develop/examples/example2/dialogs1.inc
similarity index 100%
rename from programs/develop/examples/example2/trunk/dialogs1.inc
rename to programs/develop/examples/example2/dialogs1.inc
diff --git a/programs/develop/examples/example2/trunk/example2.asm b/programs/develop/examples/example2/example2.asm
similarity index 98%
rename from programs/develop/examples/example2/trunk/example2.asm
rename to programs/develop/examples/example2/example2.asm
index 8d5934d11..6c5426587 100644
--- a/programs/develop/examples/example2/trunk/example2.asm
+++ b/programs/develop/examples/example2/example2.asm
@@ -1,3 +1,7 @@
+
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;
 ;   MENU / DIALOG EXAMPLE
@@ -18,7 +22,7 @@ use32
                dd     0x0 , 0x0               ; I_Param , I_Icon
 
 include 'lang.inc'
-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'
 include 'dialogs1.inc'
 
 menu_history dd 0x0