From 64b1d5344a572a83ae11be863df580c193f9ef8d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 21 Nov 2016 20:12:44 +0000 Subject: [PATCH] move cubeline to ISO, add "fasm -m 32768" into libimg Tupfile git-svn-id: svn://kolibrios.org@6734 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- programs/develop/libraries/libs-dev/libimg/Tupfile.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index ff4ddf5dfa..cadbdaa35b 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -573,13 +573,13 @@ end -- tup.getconfig('NO_MSVC') ~= 'full' -- Programs that require GCC to compile. if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { - {"3D/CUBELINE", PROGS .. "/demos/cubeline/trunk/cubeline"}, {"3D/GEARS", PROGS .. "/demos/gears/trunk/gears"}, {"GAMES/CHECKERS", PROGS .. "/games/checkers/trunk/checkers"}, {"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"}, {"SHELL", PROGS .. "/system/shell/shell"}, }) tup.append_table(extra_files, { + {"kolibrios/demos/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, {"kolibrios/emul/e80/e80", PROGS .. "/emulator/e80/trunk/e80"}, {"kolibrios/games/2048/", PROGS .. "/games/2048/2048"}, {"kolibrios/games/donkey", PROGS .. "/games/donkey/donkey"}, diff --git a/programs/develop/libraries/libs-dev/libimg/Tupfile.lua b/programs/develop/libraries/libs-dev/libimg/Tupfile.lua index 99f85d158e..a68bff973c 100644 --- a/programs/develop/libraries/libs-dev/libimg/Tupfile.lua +++ b/programs/develop/libraries/libs-dev/libimg/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("libimg.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "libimg.obj") +tup.rule("libimg.asm", "fasm -m 32768 %f %o " .. tup.getconfig("KPACK_CMD"), "libimg.obj")