system/menu: Post-SVN clean up

- Move source code from `trunk` into program root directory.
- Update build files and ASM include paths.
This commit is contained in:
2025-05-20 10:34:40 +01:00
parent 00f3b86d44
commit dbd340dd7d
8 changed files with 10 additions and 7 deletions

View File

@@ -400,7 +400,7 @@ tup.append_table(img_files, {
{"@DOCKY", VAR_PROGS .. "/system/docky/docky"}, {"@DOCKY", VAR_PROGS .. "/system/docky/docky"},
{"@HA", VAR_PROGS .. "/other/ha/HA"}, {"@HA", VAR_PROGS .. "/other/ha/HA"},
{"@ICON", VAR_PROGS .. "/system/icon_new/icon"}, {"@ICON", VAR_PROGS .. "/system/icon_new/icon"},
{"@MENU", VAR_PROGS .. "/system/menu/trunk/menu"}, {"@MENU", VAR_PROGS .. "/system/menu/menu"},
{"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"}, {"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"},
{"@OPEN", VAR_PROGS .. "/system/open/open"}, {"@OPEN", VAR_PROGS .. "/system/open/open"},
{"@TASKBAR", VAR_PROGS .. "/system/taskbar/trunk/TASKBAR"}, {"@TASKBAR", VAR_PROGS .. "/system/taskbar/trunk/TASKBAR"},

View File

@@ -68,7 +68,7 @@ fasm system\gmon\gmon.asm %BIN%\gmon
fasm system\icon\icon.asm %BIN%\icon fasm system\icon\icon.asm %BIN%\icon
fasm system\kbd\trunk\kbd.ASM %BIN%\kbd fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
fasm system\launcher\launcher.asm %BIN%\launcher fasm system\launcher\launcher.asm %BIN%\launcher
fasm system\menu\trunk\menu.asm %BIN%\@menu fasm system\menu\menu.asm %BIN%\@menu
fasm system\mgb\trunk\mgb.asm %BIN%\mgb fasm system\mgb\trunk\mgb.asm %BIN%\mgb
fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul
fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR

View File

@@ -1,5 +1,5 @@
if tup.getconfig("NO_FASM") ~= "" then return end 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") tup.include(HELPERDIR .. "/use_fasm.lua")
add_include(tup.getvariantdir()) add_include(tup.getvariantdir())

View File

@@ -1,3 +1,6 @@
; SPDX-License-Identifier: NOASSERTION
;
;****************************************************************************** ;******************************************************************************
; MAIN MENU ; MAIN MENU
;****************************************************************************** ;******************************************************************************
@@ -41,11 +44,11 @@
dd bootparam ; boot parameters dd bootparam ; boot parameters
dd 0x0 ; path dd 0x0 ; path
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
include "..\..\..\macros.inc" include "..\..\macros.inc"
include "..\..\..\struct.inc" include "..\..\struct.inc"
include "..\..\..\gui_patterns.inc" include "..\..\gui_patterns.inc"
; Formatted debug output: ; Formatted debug output:
include "..\..\..\debug-fdo.inc" include "..\..\debug-fdo.inc"
__DEBUG__ = 1 ; 0 - disable debug output / 1 - enable debug output __DEBUG__ = 1 ; 0 - disable debug output / 1 - enable debug output
__DEBUG_LEVEL__ = DBG_ERR ; set the debug level __DEBUG_LEVEL__ = DBG_ERR ; set the debug level
DBG_ALL = 0 ; all messages DBG_ALL = 0 ; all messages