diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 495321fe5..0faaa0ac2 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -456,7 +456,7 @@ tup.append_table(img_files, { {"3D/VIEW3DS", VAR_PROGS .. "/demos/view3ds/view3ds"}, {"DEMOS/BCDCLK", VAR_PROGS .. "/demos/bcdclk/bcdclk"}, {"DEMOS/BUDHBROT", VAR_PROGS .. "/demos/buddhabrot/buddhabrot"}, - {"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/trunk/eyes"}, + {"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/eyes"}, {"DEMOS/FIREWORK", VAR_PROGS .. "/demos/firework/firework"}, {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/movback"}, {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/plasma"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 7ece61736..e97b91b23 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -212,7 +212,7 @@ fasm demos\bgitest\trunk\bgitest.asm %BIN%\fonts\bgitest fasm demos\colorref\colorref.asm %BIN%\demos\colorref fasm demos\crownscr\crownscr.asm %BIN%\3d\crownscr fasm demos\cslide\cslide.asm %BIN%\demos\cslide -fasm demos\eyes\trunk\eyes.asm %BIN%\demos\eyes +fasm demos\eyes\eyes.asm %BIN%\demos\eyes fasm demos\fire\trunk\fire.asm %BIN%\demos\fire fasm demos\fire2\trunk\fire2.asm %BIN%\demos\fire2 fasm demos\firework\trunk\firework.asm %BIN%\demos\firework diff --git a/programs/demos/eyes/trunk/Tupfile.lua b/programs/demos/eyes/Tupfile.lua similarity index 79% rename from programs/demos/eyes/trunk/Tupfile.lua rename to programs/demos/eyes/Tupfile.lua index 344378152..dc8f0f4c1 100644 --- a/programs/demos/eyes/trunk/Tupfile.lua +++ b/programs/demos/eyes/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/demos/eyes/trunk/build_en.bat b/programs/demos/eyes/build_en.bat similarity index 100% rename from programs/demos/eyes/trunk/build_en.bat rename to programs/demos/eyes/build_en.bat diff --git a/programs/demos/eyes/trunk/build_ru.bat b/programs/demos/eyes/build_ru.bat similarity index 100% rename from programs/demos/eyes/trunk/build_ru.bat rename to programs/demos/eyes/build_ru.bat diff --git a/programs/demos/eyes/trunk/eyes.asm b/programs/demos/eyes/eyes.asm similarity index 98% rename from programs/demos/eyes/trunk/eyes.asm rename to programs/demos/eyes/eyes.asm index 08d797f5f..914910969 100644 --- a/programs/demos/eyes/trunk/eyes.asm +++ b/programs/demos/eyes/eyes.asm @@ -1,3 +1,6 @@ +; SPDX-License-Identifier: NOASSERTION +; + ; ; EYES FOR MENUET ; @@ -22,7 +25,7 @@ use32 dd 0x0 dd 0x0 -include '..\..\..\macros.inc' +include '..\..\macros.inc' ENTRANCE: ; start of code ; ==== main ==== diff --git a/programs/demos/eyes/trunk/eyes.raw b/programs/demos/eyes/eyes.raw similarity index 100% rename from programs/demos/eyes/trunk/eyes.raw rename to programs/demos/eyes/eyes.raw