diff --git a/data/Tupfile.lua b/data/Tupfile.lua index edcf7d7c98..1f92739f4c 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -286,7 +286,6 @@ extra_files = { {"kolibrios/utils/cnc_editor/kolibri.NC", PROGS .. "/other/cnc_editor/kolibri.NC"}, {"kolibrios/utils/vmode", "common/vmode"}, {"kolibrios/utils/texture", "common/utils/texture"}, - {"kolibrios/utils/thashview", "common/utils/thashview"}, } if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, @@ -683,6 +682,13 @@ tup.append_table(extra_files, { }) end -- tup.getconfig('NO_MSVC') ~= 'full' +-- Programs that require TCC to compile. +if tup.getconfig('NO_TCC') ~= 'full' then +tup.append_table(extra_files, { + {"kolibrios/utils/thashview", PROGS .. "/other/TinyHashView/thashview"}, +}) +end -- tup.getconfig('NO_TCC') ~= 'full' + -- Programs that require GCC to compile. if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { diff --git a/data/common/utils/thashview b/data/common/utils/thashview deleted file mode 100644 index 5866adc6f8..0000000000 Binary files a/data/common/utils/thashview and /dev/null differ diff --git a/programs/other/TinyHashView/Tupfile.lua b/programs/other/TinyHashView/Tupfile.lua new file mode 100644 index 0000000000..109f8361c2 --- /dev/null +++ b/programs/other/TinyHashView/Tupfile.lua @@ -0,0 +1,10 @@ +if tup.getconfig("NO_TCC") ~= "" then return end + +TCC="kos32-tcc " + +CFLAGS = "-I../../develop/ktcc/trunk/libc/include" +LDFLAGS = "-nostdlib ../../develop/ktcc/trunk/bin/lib/start.o -L../../develop/ktcc/trunk/bin/lib" +LIBS = "-lck -lcryptal -ldialog" + +COMMAND=string.format("%s %s %s %s %s ", TCC, CFLAGS, "%f -o %o", LDFLAGS, LIBS) +tup.rule("thashview.c", COMMAND .. tup.getconfig("KPACK_CMD"), "thashview")