From efbe3e0a39aeec4868f5203729a21e8cbfad826f Mon Sep 17 00:00:00 2001 From: IgorA Date: Fri, 12 Feb 2016 21:38:29 +0000 Subject: [PATCH] add 'info3ds_u' in iso git-svn-id: svn://kolibrios.org@6208 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 6 ++++++ programs/develop/info3ds/Tupfile.lua | 1 + programs/develop/libraries/TinyGL/asm_fork/Tupfile.lua | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 programs/develop/libraries/TinyGL/asm_fork/Tupfile.lua diff --git a/data/Tupfile.lua b/data/Tupfile.lua index ab67be6c1c..52057c148e 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -305,6 +305,11 @@ tup.append_table(img_files, { {"3D/CROWNSCR", PROGS .. "/demos/crownscr/trunk/crownscr"}, {"3D/FREE3D04", PROGS .. "/demos/free3d04/trunk/free3d04"}, {"3D/VIEW3DS", PROGS .. "/demos/3DS/VIEW3DS"}, + {"3D/INFO3DS_U", PROGS .. "/develop/info3ds/info3ds_u"}, + {"3D/OBJECTS.PNG", PROGS .. "/develop/info3ds/objects.png"}, + {"3D/TL_SYS_16.PNG", PROGS .. "/develop/info3ds/tl_sys_16.png"}, + {"3D/TOOLBAR.PNG", PROGS .. "/develop/info3ds/toolbar.png"}, + {"3D/INFO3DS.INI", PROGS .. "/develop/info3ds/info3ds.ini"}, {"DEMOS/BCDCLK", PROGS .. "/demos/bcdclk/trunk/bcdclk"}, {"DEMOS/CIRCLE", PROGS .. "/develop/examples/circle/trunk/circle"}, {"DEMOS/COLORREF", PROGS .. "/demos/colorref/trunk/colorref"}, @@ -360,6 +365,7 @@ tup.append_table(img_files, { {"LIB/ARCHIVER.OBJ", PROGS .. "/fs/kfar/trunk/kfar_arc/kfar_arc.obj"}, {"LIB/BOX_LIB.OBJ", PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"}, {"LIB/BUF2D.OBJ", PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"}, + {"LIB/TINYGL.OBJ", PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"}, {"LIB/CONSOLE.OBJ", PROGS .. "/develop/libraries/console/console.obj"}, {"LIB/LIBGFX.OBJ", PROGS .. "/develop/libraries/libs-dev/libgfx/libgfx.obj"}, {"LIB/LIBIMG.OBJ", PROGS .. "/develop/libraries/libs-dev/libimg/libimg.obj"}, diff --git a/programs/develop/info3ds/Tupfile.lua b/programs/develop/info3ds/Tupfile.lua index fcb41193cc..b3a8c255da 100644 --- a/programs/develop/info3ds/Tupfile.lua +++ b/programs/develop/info3ds/Tupfile.lua @@ -1,3 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) tup.rule({"info3ds.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "info3ds") +tup.rule({"info3ds_u.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "info3ds_u") diff --git a/programs/develop/libraries/TinyGL/asm_fork/Tupfile.lua b/programs/develop/libraries/TinyGL/asm_fork/Tupfile.lua new file mode 100644 index 0000000000..a301a3080d --- /dev/null +++ b/programs/develop/libraries/TinyGL/asm_fork/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("tinygl.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "tinygl.obj")