From 876a5030d6874c45b0b6300f2c15b8380e3245a5 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 21 Jun 2021 15:34:23 +0000 Subject: [PATCH] blocks: add to ISO git-svn-id: svn://kolibrios.org@8907 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 8 +++++--- data/common/File Managers/icons.ini | 1 + data/common/settings/assoc.ini | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index c78cc320f2..8105fbef29 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -159,6 +159,8 @@ extra_files = { {"kolibrios/3D/info3ds/OBJECTS.PNG", PROGS .. "/develop/info3ds/objects.png"}, {"kolibrios/3D/info3ds/TOOLBAR.PNG", PROGS .. "/develop/info3ds/toolbar.png"}, {"kolibrios/3D/info3ds/FONT8X9.BMP", PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, + {"kolibrios/3D/blocks/", PROGS .. "/bcc32/games/blocks/bin/*"}, + {"kolibrios/3D/blocks/models", PROGS .. "/bcc32/games/blocks/models/*"}, {"kolibrios/3D/md2view/", "common/3d/md2view/*"}, {"kolibrios/3D/md2view/md2_model/", "common/3d/md2view/md2_model/*"}, {"kolibrios/3D/voxel_editor/VOX_EDITOR.INI", PROGS .. "/media/voxel_editor/trunk/vox_editor.ini"}, @@ -566,14 +568,14 @@ tup.append_table(extra_files, { {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/enable.exe"}, {"kolibrios/3D/3dsheart", PROGS .. "/demos/3dsheart/trunk/3dsheart"}, {"kolibrios/3D/flatwav", PROGS .. "/demos/flatwav/trunk/flatwav"}, - {"kolibrios/3D/info3ds/INFO3DS", PROGS .. "/develop/info3ds/info3ds"}, - {"kolibrios/3D/info3ds/INFO3DS_U", PROGS .. "/develop/info3ds/info3ds_u"}, {"kolibrios/3D/mos3de", PROGS .. "/demos/mos3de/mos3de"}, + {"kolibrios/3D/info3ds/INFO3DS", PROGS .. "/develop/info3ds/info3ds"}, + {"kolibrios/3D/textures1", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/textures1"}, + {"kolibrios/3D/info3ds/INFO3DS_U", PROGS .. "/develop/info3ds/info3ds_u"}, {"kolibrios/3D/voxel_editor/VOXEL_EDITOR", PROGS .. "/media/voxel_editor/trunk/voxel_editor"}, {"kolibrios/3D/voxel_utilites/VOX_CREATOR" , PROGS .. "/media/voxel_editor/utilites/vox_creator"}, {"kolibrios/3D/voxel_utilites/VOX_MOVER" , PROGS .. "/media/voxel_editor/utilites/vox_mover"}, {"kolibrios/3D/voxel_utilites/VOX_TGL" , PROGS .. "/media/voxel_editor/utilites/vox_tgl"}, - {"kolibrios/3D/textures1", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/textures1"}, {"kolibrios/demos/buddhabrot", PROGS .. "/demos/buddhabrot/trunk/buddhabrot"}, {"kolibrios/demos/life3", PROGS .. "/games/life3/trunk/life3"}, {"kolibrios/demos/qjulia", PROGS .. "/demos/qjulia/trunk/qjulia"}, diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index a28df42d43..6ce054e19c 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -160,6 +160,7 @@ lif=15 asc=15 vox=15 stl=15 +bjs=15 kex=16 skn=17 obj=18 diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index a7e3ca214f..3699946175 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -207,3 +207,4 @@ bas=/kolibrios/develop/TinyBasic/TinyBasic vox=/kolibrios/3D/voxel_editor/VOXEL_EDITOR mgb=/sys/mgb +bjs=/kolibrios/3D/blocks/blocks.kex