diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 6a97cff19..8a71ca0d0 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -519,7 +519,7 @@ tup.append_table(img_files, { {"LIB/LIBIO.OBJ", VAR_PROGS .. "/develop/libraries/libs-dev/libio/libio.obj"}, {"LIB/MSGBOX.OBJ", VAR_PROGS .. "/develop/libraries/msgbox/msgbox.obj"}, {"LIB/NETWORK.OBJ", VAR_PROGS .. "/develop/libraries/network/network.obj"}, - {"LIB/PROC_LIB.OBJ", VAR_PROGS .. "/develop/libraries/proc_lib/trunk/proc_lib.obj"}, + {"LIB/PROC_LIB.OBJ", VAR_PROGS .. "/develop/libraries/proc_lib/proc_lib.obj"}, {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"}, {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"}, {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"}, diff --git a/programs/develop/libraries/proc_lib/trunk/Tupfile.lua b/programs/develop/libraries/proc_lib/Tupfile.lua similarity index 100% rename from programs/develop/libraries/proc_lib/trunk/Tupfile.lua rename to programs/develop/libraries/proc_lib/Tupfile.lua diff --git a/programs/develop/libraries/proc_lib/trunk/build.sh b/programs/develop/libraries/proc_lib/build.sh similarity index 100% rename from programs/develop/libraries/proc_lib/trunk/build.sh rename to programs/develop/libraries/proc_lib/build.sh diff --git a/programs/develop/libraries/proc_lib/trunk/colrdial.mac b/programs/develop/libraries/proc_lib/colrdial.mac similarity index 100% rename from programs/develop/libraries/proc_lib/trunk/colrdial.mac rename to programs/develop/libraries/proc_lib/colrdial.mac diff --git a/programs/develop/libraries/proc_lib/trunk/opendial.mac b/programs/develop/libraries/proc_lib/opendial.mac similarity index 100% rename from programs/develop/libraries/proc_lib/trunk/opendial.mac rename to programs/develop/libraries/proc_lib/opendial.mac diff --git a/programs/develop/libraries/proc_lib/trunk/proc_lib.asm b/programs/develop/libraries/proc_lib/proc_lib.asm similarity index 91% rename from programs/develop/libraries/proc_lib/trunk/proc_lib.asm rename to programs/develop/libraries/proc_lib/proc_lib.asm index 94f5fb472..5c994598a 100644 --- a/programs/develop/libraries/proc_lib/trunk/proc_lib.asm +++ b/programs/develop/libraries/proc_lib/proc_lib.asm @@ -1,70 +1,73 @@ -;***************************************************************************** -; Proc_Lib - library for common procedures -; -; Authors: -; Marat Zakiyanov aka Mario79, aka Mario -;***************************************************************************** - -format MS COFF - -public EXPORTS - -section '.flat' code readable align 16 -include '../../../../macros.inc' -;include '../../../../proc32.inc' -include '../../../../KOSfuncs.inc' -include 'opendial.mac' -include 'colrdial.mac' -;include 'debug.inc' -;----------------------------------------------------------------------------- - -;-------------------------------------------------- -; Open Dialog -;-------------------------------------------------- -align 16 -use_OpenDialog - -;-------------------------------------------------- -; Color Dialog -;-------------------------------------------------- -align 16 -use_ColorDialog - -;-------------------------------------------------- -align 16 -lib_init: -ret - -;-------------------------------------------------- -align 16 -EXPORTS: - - -dd sz_init, lib_init -dd sz_version, 0x00000001 - -dd sz_OpenDialog_init, OpenDialog.init -dd sz_OpenDialog_start, OpenDialog.start -dd sz_OpenDialog_set_file_name, OpenDialog.set_file_name -dd sz_OpenDialog_set_file_ext, OpenDialog.set_file_ext -dd szVersion_OpenDialog, 0x00010001 - -dd sz_ColorDialog_init, ColorDialog.init -dd sz_ColorDialog_start, ColorDialog.start -dd szVersion_ColorDialog, 0x00010001 - -dd 0,0 -;----------------------------------------------------------------------------- -sz_init db 'lib_init',0 -sz_version db 'version',0 - -sz_OpenDialog_init db 'OpenDialog_init',0 -sz_OpenDialog_start db 'OpenDialog_start',0 -sz_OpenDialog_set_file_name db 'OpenDialog_set_file_name',0 -sz_OpenDialog_set_file_ext db 'OpenDialog_set_file_ext',0 -szVersion_OpenDialog db 'Version_OpenDialog',0 - -sz_ColorDialog_init db 'ColorDialog_init',0 -sz_ColorDialog_start db 'ColorDialog_start',0 -szVersion_ColorDialog db 'Version_ColorDialog',0 -;----------------------------------------------------------------------------- +; SPDX-License-Identifier: NOASSERTION +; + +;***************************************************************************** +; Proc_Lib - library for common procedures +; +; Authors: +; Marat Zakiyanov aka Mario79, aka Mario +;***************************************************************************** + +format MS COFF + +public EXPORTS + +section '.flat' code readable align 16 +include '../../../macros.inc' +;include '../../../proc32.inc' +include '../../../KOSfuncs.inc' +include 'opendial.mac' +include 'colrdial.mac' +;include 'debug.inc' +;----------------------------------------------------------------------------- + +;-------------------------------------------------- +; Open Dialog +;-------------------------------------------------- +align 16 +use_OpenDialog + +;-------------------------------------------------- +; Color Dialog +;-------------------------------------------------- +align 16 +use_ColorDialog + +;-------------------------------------------------- +align 16 +lib_init: +ret + +;-------------------------------------------------- +align 16 +EXPORTS: + + +dd sz_init, lib_init +dd sz_version, 0x00000001 + +dd sz_OpenDialog_init, OpenDialog.init +dd sz_OpenDialog_start, OpenDialog.start +dd sz_OpenDialog_set_file_name, OpenDialog.set_file_name +dd sz_OpenDialog_set_file_ext, OpenDialog.set_file_ext +dd szVersion_OpenDialog, 0x00010001 + +dd sz_ColorDialog_init, ColorDialog.init +dd sz_ColorDialog_start, ColorDialog.start +dd szVersion_ColorDialog, 0x00010001 + +dd 0,0 +;----------------------------------------------------------------------------- +sz_init db 'lib_init',0 +sz_version db 'version',0 + +sz_OpenDialog_init db 'OpenDialog_init',0 +sz_OpenDialog_start db 'OpenDialog_start',0 +sz_OpenDialog_set_file_name db 'OpenDialog_set_file_name',0 +sz_OpenDialog_set_file_ext db 'OpenDialog_set_file_ext',0 +szVersion_OpenDialog db 'Version_OpenDialog',0 + +sz_ColorDialog_init db 'ColorDialog_init',0 +sz_ColorDialog_start db 'ColorDialog_start',0 +szVersion_ColorDialog db 'Version_ColorDialog',0 +;----------------------------------------------------------------------------- diff --git a/programs/develop/libraries/proc_lib/trunk/run.bat b/programs/develop/libraries/proc_lib/run.bat similarity index 100% rename from programs/develop/libraries/proc_lib/trunk/run.bat rename to programs/develop/libraries/proc_lib/run.bat