diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 972d12d82..8b6a9edd2 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -157,7 +157,7 @@ extra_files = { {"kolibrios/3D/info3ds/OBJECTS.PNG", SRC_PROGS .. "/develop/info3ds/objects.png"}, {"kolibrios/3D/info3ds/TOOLBAR.PNG", SRC_PROGS .. "/develop/info3ds/toolbar.png"}, {"kolibrios/3D/info3ds/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, - {"kolibrios/3D/blocks/", "../programs/bcc32/games/blocks/bin/*"}, + {"kolibrios/3D/blocks/blocks.kex", "../programs/bcc32/games/blocks/bin/blocks.kex"}, {"kolibrios/3D/blocks/models/", "../programs/bcc32/games/blocks/models/*"}, {"kolibrios/3D/md2view/", "common/3d/md2view/*"}, {"kolibrios/3D/md2view/md2_model/", "common/3d/md2view/md2_model/*"}, @@ -631,6 +631,7 @@ tup.append_table(extra_files, { {"kolibrios/utils/calcplus", VAR_PROGS .. "/other/calcplus/calcplus"}, {"kolibrios/utils/kfm/kfm", VAR_PROGS .. "/fs/kfm/trunk/kfm"}, {"kolibrios/utils/tedit/t_edit", VAR_PROGS .. "/other/t_edit/t_edit"}, + {"kolibrios/3D/blocks/block.bin", VAR_PROGS .. "/bcc32/games/blocks/block.bin"} }) -- For russian build, add russian-only programs. if build_type == "ru_RU" then tup.append_table(img_files, { diff --git a/programs/bcc32/games/blocks/Tupfile.lua b/programs/bcc32/games/blocks/Tupfile.lua new file mode 100644 index 000000000..b6be6cad2 --- /dev/null +++ b/programs/bcc32/games/blocks/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("block.asm", "fasm -m 65636 %f %o " .. tup.getconfig("KPACK_CMD"), "block.bin") diff --git a/programs/bcc32/games/blocks/bin/block.bin b/programs/bcc32/games/blocks/bin/block.bin deleted file mode 100644 index 8bfd22b37..000000000 Binary files a/programs/bcc32/games/blocks/bin/block.bin and /dev/null differ