diff --git a/data/Tupfile.lua b/data/Tupfile.lua index e812fada6..103a13299 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -482,7 +482,7 @@ tup.append_table(img_files, { {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"}, {"DEVELOP/SCANCODE", VAR_PROGS .. "/develop/scancode/trunk/scancode"}, {"DEVELOP/EXAMPLES/CIRCLE", VAR_PROGS .. "/develop/examples/circle/trunk/circle"}, - {"DEVELOP/EXAMPLES/COLORREF", VAR_PROGS .. "/demos/colorref/trunk/colorref"}, + {"DEVELOP/EXAMPLES/COLORREF", VAR_PROGS .. "/demos/colorref/colorref"}, {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"}, {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 43fc50d50..8cae84dbb 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -209,7 +209,7 @@ nasmw -t -f bin -o ..\..\..\%BIN%\demos\aclock aclock.asm cd ..\..\.. fasm demos\bcdclk\bcdclk.asm %BIN%\demos\bcdclk fasm demos\bgitest\trunk\bgitest.asm %BIN%\fonts\bgitest -fasm demos\colorref\trunk\colorref.asm %BIN%\demos\colorref +fasm demos\colorref\colorref.asm %BIN%\demos\colorref fasm demos\crownscr\trunk\crownscr.asm %BIN%\3d\crownscr fasm demos\cslide\trunk\cslide.asm %BIN%\demos\cslide fasm demos\eyes\trunk\eyes.asm %BIN%\demos\eyes diff --git a/programs/demos/colorref/trunk/Tupfile.lua b/programs/demos/colorref/Tupfile.lua similarity index 79% rename from programs/demos/colorref/trunk/Tupfile.lua rename to programs/demos/colorref/Tupfile.lua index d48992dd5..2e131aa8d 100644 --- a/programs/demos/colorref/trunk/Tupfile.lua +++ b/programs/demos/colorref/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/colorref/trunk/build_en.bat b/programs/demos/colorref/build_en.bat similarity index 100% rename from programs/demos/colorref/trunk/build_en.bat rename to programs/demos/colorref/build_en.bat diff --git a/programs/demos/colorref/trunk/build_ru.bat b/programs/demos/colorref/build_ru.bat similarity index 100% rename from programs/demos/colorref/trunk/build_ru.bat rename to programs/demos/colorref/build_ru.bat diff --git a/programs/demos/colorref/trunk/colorref.asm b/programs/demos/colorref/colorref.asm similarity index 99% rename from programs/demos/colorref/trunk/colorref.asm rename to programs/demos/colorref/colorref.asm index 2fcb7bb49..8efa498c1 100644 --- a/programs/demos/colorref/trunk/colorref.asm +++ b/programs/demos/colorref/colorref.asm @@ -1,3 +1,6 @@ +; SPDX-License-Identifier: NOASSERTION +; + ; COLORREF.ASM - COLOR REFERENCE ; ; Compile with FASM for Menuet @@ -15,7 +18,7 @@ use32 dd 0x0,0x0 ; I_Param , I_Icon include 'lang.inc' -include '..\..\..\macros.inc' +include '..\..\macros.inc' wide: dd 0 ; screen pixels width mouse: dd 0 ; 1=right,2=left [mouse click] @@ -148,7 +151,7 @@ draw_window: mov edx,0x14000000 ; work area color (type II) mov edi,title ; frame color mcall - + call palette ; display color palette mcall 12, 2 @@ -267,7 +270,7 @@ help: add ecx, 236 sub ecx, eax - + mov ebx,5*65536+190 ; x and width mov edx,0x465e8f ; dark denim color mov eax,13 ; write text funx @@ -294,7 +297,7 @@ h1: push ecx jne h2 ; nope mov eax,2 ; yep, burn it mcall -h2: +h2: call draw_window ret