From e9e08c56b678eb5e6db23bc6b42067de35d0062c Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Tue, 21 May 2024 14:45:21 +0000 Subject: [PATCH] Update Tupfile.lua's for tup-0.8 git-svn-id: svn://kolibrios.org@10042 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/other/jumpnbump/Tupfile.lua | 9 +- contrib/other/udcli/Tupfile.lua | 2 +- contrib/sdk/sources/newlib/libc/Tupfile.lua | 2 +- contrib/sdk/sources/sqlite3/Tupfile.lua | 6 +- contrib/sdk/sources/sqlite3/shell/Tupfile.lua | 13 +- contrib/sdk/sources/zlib/Tupfile.lua | 7 +- data/Tupfile.lua | 1059 +++++++++-------- drivers/audio/a5536/Tupfile.lua | 2 +- drivers/ddk/Tupfile.lua | 2 +- drivers/devman/Tupfile.lua | 2 +- drivers/sensors/k10temp/Tupfile.lua | 2 +- kernel/branches/kolibri-ahci/Tupfile.lua | 14 +- .../kolibri-ahci/bootloader/Tupfile.lua | 6 +- kernel/branches/kolibri-lldw/Tupfile.lua | 14 +- .../kolibri-lldw/bootloader/Tupfile.lua | 6 +- .../kolibrios-pe-clevermouse/Tupfile.lua | 14 +- .../bootloader/Tupfile.lua | 6 +- kernel/trunk/Tupfile.lua | 12 +- kernel/trunk/bootloader/Tupfile.lua | 6 +- programs/cmm/app_plus/Tupfile.lua | 2 +- programs/cmm/appearance/Tupfile.lua | 2 +- programs/cmm/barscfg/Tupfile.lua | 2 +- programs/cmm/browser/Tupfile.lua | 2 +- programs/cmm/clipview/Tupfile.lua | 2 +- programs/cmm/dicty/Tupfile.lua | 2 +- programs/cmm/diff/Tupfile.lua | 2 +- programs/cmm/downloader/Tupfile.lua | 2 +- programs/cmm/drvinst/Tupfile.lua | 2 +- programs/cmm/eolite/Tupfile.lua | 2 +- programs/cmm/examples/Tupfile.lua | 8 +- programs/cmm/iconedit/Tupfile.lua | 2 +- programs/cmm/imgedit/Tupfile.lua | 2 +- programs/cmm/kf_font_viewer/Tupfile.lua | 2 +- programs/cmm/menu/Tupfile.lua | 2 +- programs/cmm/misc/Tupfile.lua | 12 +- programs/cmm/mousecfg/Tupfile.lua | 2 +- programs/cmm/notes/Tupfile.lua | 2 +- programs/cmm/pixie2/Tupfile.lua | 2 +- programs/cmm/quark/Tupfile.lua | 2 +- programs/cmm/search/Tupfile.lua | 2 +- programs/cmm/sysmon/Tupfile.lua | 2 +- programs/cmm/taskbar2/Tupfile.lua | 2 +- programs/cmm/the_bus/Tupfile.lua | 2 +- programs/cmm/tmpdisk/Tupfile.lua | 2 +- programs/demos/3dcube2/trunk/Tupfile.lua | 8 +- programs/demos/3detx60b/trunk/Tupfile.lua | 8 +- programs/demos/3dtcub10/trunk/Tupfile.lua | 8 +- programs/demos/PlasmaEffect/Tupfile.lua | 6 +- programs/demos/ScreenRuler/Tupfile.lua | 8 +- programs/demos/bcdclk/trunk/Tupfile.lua | 8 +- programs/demos/colorref/trunk/Tupfile.lua | 8 +- programs/demos/crownscr/trunk/Tupfile.lua | 8 +- programs/demos/cslide/trunk/Tupfile.lua | 8 +- programs/demos/eyes/trunk/Tupfile.lua | 8 +- programs/demos/free3d04/trunk/Tupfile.lua | 8 +- programs/demos/magnify/trunk/Tupfile.lua | 8 +- programs/demos/movback/trunk/Tupfile.lua | 8 +- programs/demos/plasma/trunk/Tupfile.lua | 8 +- programs/demos/ray/Tupfile.lua | 8 +- programs/demos/timer/trunk/Tupfile.lua | 8 +- programs/demos/tinyfrac/trunk/Tupfile.lua | 8 +- programs/demos/transp/trunk/Tupfile.lua | 8 +- programs/demos/trantest/trunk/Tupfile.lua | 8 +- programs/demos/use_mb/Tupfile.lua | 8 +- programs/develop/cObj/trunk/Tupfile.lua | 8 +- .../examples/cpuspeed/trunk/Tupfile.lua | 8 +- .../examples/example2/trunk/Tupfile.lua | 8 +- .../examples/example3/trunk/Tupfile.lua | 8 +- .../develop/examples/hello/trunk/Tupfile.lua | 8 +- .../develop/examples/ipc/trunk/Tupfile.lua | 8 +- .../develop/examples/ir/trunk/Tupfile.lua | 8 +- .../develop/examples/rtdata/trunk/Tupfile.lua | 8 +- .../examples/template/trunk/Tupfile.lua | 8 +- .../develop/examples/thread/trunk/Tupfile.lua | 8 +- programs/develop/fasm/1.73/Tupfile.lua | 8 +- programs/develop/fasm/tags/1.71/Tupfile.lua | 8 +- programs/develop/h2d2b/trunk/Tupfile.lua | 8 +- programs/develop/heed/trunk/Tupfile.lua | 8 +- programs/develop/info3ds/Tupfile.lua | 10 +- programs/develop/keyascii/trunk/Tupfile.lua | 8 +- programs/develop/kol_f_edit/Tupfile.lua | 10 +- .../develop/libraries/InputBox/Tupfile.lua | 12 +- .../develop/libraries/ufmod/Fasm/Tupfile.lua | 8 +- programs/develop/scancode/trunk/Tupfile.lua | 8 +- programs/develop/str_double/trunk/Tupfile.lua | 8 +- programs/develop/tinypad/trunk/Tupfile.lua | 8 +- programs/emulator/e80/trunk/Tupfile.lua | 1 + programs/fs/copyr/trunk/Tupfile.lua | 8 +- programs/fs/kfar/trunk/Tupfile.lua | 8 +- programs/fs/kfar/trunk/kfar_arc/Tupfile.lua | 8 +- programs/fs/kfm/trunk/Tupfile.lua | 8 +- programs/fs/unz/Tupfile.lua | 8 +- programs/games/15/trunk/Tupfile.lua | 8 +- programs/games/FindNumbers/trunk/Tupfile.lua | 2 +- programs/games/MSquare/trunk/Tupfile.lua | 8 +- programs/games/almaz/Tupfile.lua | 8 +- programs/games/arcanii/trunk/Tupfile.lua | 8 +- programs/games/arcanoid/trunk/Tupfile.lua | 8 +- programs/games/bomber/Tupfile.lua | 8 +- programs/games/c4/trunk/Tupfile.lua | 4 +- programs/games/clicks/trunk/Tupfile.lua | 2 +- programs/games/codemaster/Tupfile.lua | 12 +- programs/games/flood-it/trunk/Tupfile.lua | 2 +- programs/games/freecell/Tupfile.lua | 8 +- programs/games/fridge/Tupfile.lua | 2 +- programs/games/gomoku/trunk/Tupfile.lua | 8 +- programs/games/klavisha/trunk/Tupfile.lua | 8 +- programs/games/life3/trunk/Tupfile.lua | 8 +- programs/games/lines/Tupfile.lua | 8 +- programs/games/mine/trunk/Tupfile.lua | 2 +- programs/games/phenix/trunk/Tupfile.lua | 8 +- programs/games/pipes/Tupfile.lua | 8 +- programs/games/pong/trunk/Tupfile.lua | 8 +- programs/games/sudoku/trunk/Tupfile.lua | 8 +- programs/games/sw/trunk/Tupfile.lua | 8 +- programs/games/tanks/trunk/Tupfile.lua | 8 +- programs/games/tetris/trunk/Tupfile.lua | 8 +- programs/hd_load/mtldr_install/Tupfile.lua | 6 +- programs/media/img_transform/Tupfile.lua | 8 +- programs/media/midamp/trunk/Tupfile.lua | 8 +- programs/media/midiplay/trunk/Tupfile.lua | 8 +- programs/media/piano/Tupfile.lua | 8 +- programs/media/pic4/trunk/Tupfile.lua | 8 +- programs/media/scrshoot/Tupfile.lua | 8 +- .../media/voxel_editor/utilites/Tupfile.lua | 8 +- programs/media/zsea/Tupfile.lua | 8 +- programs/other/cnc_control/Tupfile.lua | 8 +- programs/other/cnc_editor/Tupfile.lua | 8 +- programs/other/ha/Tupfile.lua | 10 +- .../other/outdated/bgitest/trunk/Tupfile.lua | 8 +- programs/other/outdated/cdp/trunk/Tupfile.lua | 8 +- .../other/outdated/clip/trunk/Tupfile.lua | 8 +- .../other/outdated/copy2/trunk/Tupfile.lua | 8 +- .../other/outdated/iconedit/trunk/Tupfile.lua | 8 +- .../other/outdated/mixer/trunk/Tupfile.lua | 8 +- programs/other/outdated/mv/trunk/Tupfile.lua | 8 +- .../other/outdated/param/trunk/Tupfile.lua | 8 +- programs/other/outdated/rb/trunk/Tupfile.lua | 8 +- programs/other/outdated/sb/trunk/Tupfile.lua | 8 +- programs/other/t_edit/Tupfile.lua | 8 +- programs/system/MyKey/trunk/Tupfile.lua | 8 +- programs/system/RunOD/1/Tupfile.lua | 14 +- programs/system/RunOD/Tupfile.lua | 8 +- programs/system/board/trunk/Tupfile.lua | 8 +- programs/system/calendar/trunk/Tupfile.lua | 8 +- programs/system/cpu/trunk/Tupfile.lua | 8 +- programs/system/docpack/trunk/Tupfile.lua | 8 +- programs/system/end/light/Tupfile.lua | 8 +- programs/system/format/Tupfile.lua | 8 +- programs/system/hdd_info/trunk/Tupfile.lua | 8 +- programs/system/icon/trunk/Tupfile.lua | 8 +- programs/system/icon_new/Tupfile.lua | 8 +- programs/system/keybi/Tupfile.lua | 8 +- programs/system/menu/trunk/Tupfile.lua | 8 +- programs/system/mousemul/trunk/Tupfile.lua | 8 +- programs/system/open/Tupfile.lua | 8 +- programs/system/rdsave/trunk/Tupfile.lua | 8 +- programs/system/refrscrn/Tupfile.lua | 8 +- programs/system/run/trunk/Tupfile.lua | 8 +- programs/system/shell/Tupfile.lua | 1 + programs/system/skincfg/trunk/Tupfile.lua | 8 +- programs/system/taskbar/trunk/Tupfile.lua | 8 +- programs/testing/cpuid/trunk/Tupfile.lua | 8 +- programs/testing/disptest/trunk/Tupfile.lua | 8 +- programs/testing/fspeed/Tupfile.lua | 8 +- programs/testing/kbd/trunk/Tupfile.lua | 8 +- programs/testing/mgb/trunk/Tupfile.lua | 8 +- programs/testing/pcidev/trunk/Tupfile.lua | 8 +- programs/testing/protection/trunk/Tupfile.lua | 8 +- programs/use_gcc.lua | 2 +- programs/use_menuetlibc.lua | 15 +- programs/use_msvc.lua | 4 +- programs/use_newlib.lua | 11 +- programs/use_sdl.lua | 2 +- programs/use_sdl_newlib.lua | 2 +- programs/use_sound.lua | 9 +- programs/use_tinygl.lua | 9 +- skins/ConLenov/8Metro/Tupfile.lua | 6 +- skins/ConLenov/Aigul/Tupfile.lua | 6 +- skins/ConLenov/Arina/Tupfile.lua | 6 +- skins/ConLenov/FlowerMoon/Tupfile.lua | 6 +- skins/ConLenov/GX/GX_Red/Tupfile.lua | 6 +- skins/ConLenov/GX/GX_Violet/Tupfile.lua | 6 +- skins/ConLenov/Guzel/Tupfile.lua | 6 +- skins/ConLenov/Guzel_magic/Tupfile.lua | 6 +- skins/ConLenov/HotFox/Tupfile.lua | 6 +- skins/ConLenov/LucidChocolate/Tupfile.lua | 6 +- skins/ConLenov/LucidCream/Tupfile.lua | 6 +- skins/ConLenov/Win10/Tupfile.lua | 6 +- skins/ConLenov/Yaru-dark/Tupfile.lua | 6 +- skins/ConLenov/Yaru-light/Tupfile.lua | 6 +- skins/ConLenov/Yaru/Tupfile.lua | 6 +- skins/ConLenov/mntech/Tupfile.lua | 6 +- skins/Leency/Florence/Tupfile.lua | 6 +- skins/Leency/Oasis/Tupfile.lua | 6 +- skins/Leency/Shkvorka/Tupfile.lua | 7 +- skins/Leency/Vaporwave/Tupfile.lua | 6 +- skins/_old/mage-scroll/Tupfile.lua | 6 +- skins/dunkaist/mursky/Tupfile.lua | 6 +- skins/dunkaist/testtest/Tupfile.lua | 6 +- skins/maxcodehack/blacky/Tupfile.lua | 8 +- skins/misc/loggy/Tupfile.lua | 6 +- 202 files changed, 1509 insertions(+), 916 deletions(-) diff --git a/contrib/other/jumpnbump/Tupfile.lua b/contrib/other/jumpnbump/Tupfile.lua index ce77809176..bb6b9a3ad5 100755 --- a/contrib/other/jumpnbump/Tupfile.lua +++ b/contrib/other/jumpnbump/Tupfile.lua @@ -4,14 +4,15 @@ tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") tup.include(HELPERDIR .. "/use_sdl_newlib.lua") -SDK_DIR = "../../sdk" +SDK_DIR_CWD = tup.getcwd() .. "/../../sdk" +SDK_DIR_VAR = tup.getvariantdir() .. "/../../sdk" CFLAGS = CFLAGS .. " -Dstricmp=strcasecmp -DZLIB_SUPPORT -Dstrnicmp=strncasecmp -DUSE_SDL -DNDEBUG -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32" -INCLUDES = INCLUDES .. " -I. -I " .. SDK_DIR .. "/sources/zlib" -LDFLAGS = LDFLAGS .. " -Lsdl --subsystem native" +INCLUDES = INCLUDES .. " -I. -I " .. SDK_DIR_CWD .. "/sources/zlib" +LDFLAGS = LDFLAGS .. " -L" .. tup.getvariantdir() .. "/sdl --subsystem native" LIBS = "-ls -lz.dll " .. LIBS -table.insert(LIBDEPS, SDK_DIR .. "/lib/") +table.insert(LIBDEPS, SDK_DIR_VAR .. "/lib/") table.insert(LIBDEPS, "sdl/") compile_gcc{"filter.c", "fireworks.c", "main.c", "menu.c", "stub.c"} diff --git a/contrib/other/udcli/Tupfile.lua b/contrib/other/udcli/Tupfile.lua index c2efba7dc6..c7914702b9 100755 --- a/contrib/other/udcli/Tupfile.lua +++ b/contrib/other/udcli/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") -LDFLAGS = LDFLAGS .. " -Llibudis86" +LDFLAGS = LDFLAGS .. " -L" .. tup.getvariantdir() .. "/libudis86" LIBS = "-ludis86 " .. LIBS table.insert(LIBDEPS, "libudis86/") INCLUDES = INCLUDES .. " -Ilibudis86" diff --git a/contrib/sdk/sources/newlib/libc/Tupfile.lua b/contrib/sdk/sources/newlib/libc/Tupfile.lua index 375803c9ef..25ecfdf459 100644 --- a/contrib/sdk/sources/newlib/libc/Tupfile.lua +++ b/contrib/sdk/sources/newlib/libc/Tupfile.lua @@ -1,6 +1,6 @@ if tup.getconfig("NO_GCC") ~= "" or tup.getconfig("NO_FASM") ~= "" then return end tup.include("../../../../../programs/use_gcc.lua") -SDK_DIR = "../../.." +SDK_DIR = tup.getvariantdir() .. "/../../.." CFLAGS = "-c -O2 -fno-builtin -fno-ident -fomit-frame-pointer -DMISSING_SYSCALL_NAMES" LDFLAGS = "-shared -s -T libcdll.lds --out-implib " .. SDK_DIR .. "/lib/libc.dll.a --image-base 0" -- LDFLAGS = LDFLAGS .. " --output-def libc.orig.def" diff --git a/contrib/sdk/sources/sqlite3/Tupfile.lua b/contrib/sdk/sources/sqlite3/Tupfile.lua index f467a66ed7..03fe7bd4d4 100755 --- a/contrib/sdk/sources/sqlite3/Tupfile.lua +++ b/contrib/sdk/sources/sqlite3/Tupfile.lua @@ -3,7 +3,9 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") -LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib ../../lib/libsqlite3.dll.a -L../../lib " +VAR_LIB = tup.getvariantdir() .. "/../../lib" + +LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib " .. VAR_LIB .. "/libsqlite3.dll.a -L" .. VAR_LIB CFLAGS = CFLAGS .. " -U__MINGW32__ -UWIN32 -UWindows -U_WINDOWS -U_WIN32 -U__WIN32__ -U_WIN32 -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=0 -DHAVE_DLFCN_H=0 -DHAVE_FDATASYNC=0 -DHAVE_USLEEP=0 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_EDITLINE_READLINE_H=1 -DHAVE_EDITLINE=1 -DHAVE_ZLIB_H=1 -I. -D_REENTRANT=1 -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY -DSQLITE_HAVE_ZLIB=1 -DSQLITE_OS_OTHER=1 -USQLITE_OS_WIN_H -DSQLITE_TEMP_STORE=3 -D_NO_STDERR " @@ -12,5 +14,5 @@ compile_gcc{"sqlite3.c", "kolibri_vfs.c"} OBJS.extra_inputs = {"../../lib/", "../../lib/"} -tup.rule(OBJS, "kos32-ld sqlite3.def" .. LDFLAGS .. "-o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"), +tup.rule(OBJS, "kos32-ld sqlite3.def" .. LDFLAGS .. " -o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"), {"../../bin/sqlite3.dll", extra_outputs = {"../../lib/libsqlite3.dll.a", "../../lib/"}}) diff --git a/contrib/sdk/sources/sqlite3/shell/Tupfile.lua b/contrib/sdk/sources/sqlite3/shell/Tupfile.lua index f24bb20448..26dbe09467 100644 --- a/contrib/sdk/sources/sqlite3/shell/Tupfile.lua +++ b/contrib/sdk/sources/sqlite3/shell/Tupfile.lua @@ -6,14 +6,14 @@ end tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") -INCLUDES= INCLUDES .. " -I .. " +INCLUDES += " -I .. " -CFLAGS = CFLAGS .. " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DSQLITE_OS_OTHER=1 -DHAVE_UNISTD_H=0 -D_NO_STDERR -DSQLITE_OMIT_POPEN -DSQLITE_THREADSAFE=0 -D_KOLIBRI -DSQLITE_OMIT_VIRTUALTABLE -U__linux__ -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\"" +CFLAGS += " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DSQLITE_OS_OTHER=1 -DHAVE_UNISTD_H=0 -D_NO_STDERR -DSQLITE_OMIT_POPEN -DSQLITE_THREADSAFE=0 -D_KOLIBRI -DSQLITE_OMIT_VIRTUALTABLE -U__linux__ -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\"" -LDFLAGS = LDFLAGS .. " --subsystem console " +LDFLAGS += " --subsystem console " -table.insert(LIBDEPS,"../../../lib/") -LIBS = LIBS .. " -lsqlite3.dll" +table.insert(LIBDEPS, "../../../lib/") +LIBS += " -L" .. tup.getvariantdir() .. "/../../../lib -lsqlite3.dll" -- Compile -- compile_gcc{ @@ -22,6 +22,3 @@ compile_gcc{ -- Link -- link_gcc("sqlite3") - - - diff --git a/contrib/sdk/sources/zlib/Tupfile.lua b/contrib/sdk/sources/zlib/Tupfile.lua index a1a139fd4f..25797a02d7 100755 --- a/contrib/sdk/sources/zlib/Tupfile.lua +++ b/contrib/sdk/sources/zlib/Tupfile.lua @@ -3,14 +3,15 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") -LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib ../../lib/libz.dll.a -L../../lib " +VAR_LIB = tup.getvariantdir() .. "/../../lib" + +LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib " .. VAR_LIB .. "/libz.dll.a -L" .. VAR_LIB CFLAGS = CFLAGS .. " -DHAVE_UNISTD_H -U_Win32 -U_WIN32 -U__MINGW32__" compile_gcc{"adler32.c", "compress.c", "crc32.c", "deflate.c", "gzclose.c", "gzlib.c", "gzread.c", "gzwrite.c", "infback.c", "inffast.c", "inflate.c", "inftrees.c", "trees.c", "uncompr.c", "zutil.c"} ---tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libz.a", "../../lib/"}) OBJS.extra_inputs = {"../../lib/", "../../lib/"} -tup.rule(OBJS, "kos32-ld zlib.def" .. LDFLAGS .. "-o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"), +tup.rule(OBJS, "kos32-ld zlib.def " .. LDFLAGS .. " -o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"), {"../../bin/libz.dll", extra_outputs = {"../../lib/libz.dll.a", "../../lib/"}}) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 1ef5afc910..0d97b59f91 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -6,15 +6,25 @@ end --[================================[ DATA ]================================]-- -PROGS = "../programs" +SRC = tup.getcwd() .. '/..' +SRC_PROGS = SRC .. "/programs" +SRC_KERNEL = SRC .. "/kernel/trunk" + +VAR = tup.getvariantdir() .. '/..' +VAR_PROGS = VAR .. "/programs" +VAR_DRVS = VAR .. "/drivers" +VAR_SKINS = VAR .. "/skins" +VAR_KERNEL = VAR .. "/kernel/trunk" +VAR_CONTRIB = VAR .. "/contrib" +VAR_DATA = VAR .. "/data" -- Static data that doesn't need to be compiled -- Files to be included in kolibri.img. -- The first subitem of every item is name inside kolibri.img, the second is name of local file. img_files = { - {"MACROS.INC", PROGS .. "/macros.inc"}, --- {"CONFIG.INC", PROGS .. "/config.inc"}, - {"STRUCT.INC", PROGS .. "/struct.inc"}, + {"MACROS.INC", SRC_PROGS .. "/macros.inc"}, +-- {"CONFIG.INC", SRC_PROGS .. "/config.inc"}, + {"STRUCT.INC", SRC_PROGS .. "/struct.inc"}, {"FB2READ", "common/fb2read"}, {"ALLGAMES", "common/allgames"}, {"HOME.PNG", "common/wallpapers/T_Home.png"}, @@ -25,10 +35,10 @@ img_files = { {"SINE.MP3", "common/sine.mp3"}, {"LANG.INC", build_type .. "/lang.inc"}, {"NOTIFY3.PNG", "common/notify3.png"}, - {"UNIMG", PROGS .. "/fs/unimg/unimg"}, + {"UNIMG", SRC_PROGS .. "/fs/unimg/unimg"}, {"3D/HOUSE.3DS", "common/3d/house.3ds"}, {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, - {"GAMES/FLPYBIRD", PROGS .. "/games/flappybird/Release/flappybird"}, + {"GAMES/FLPYBIRD", SRC_PROGS .. "/games/flappybird/Release/flappybird"}, {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"}, -- {"LIB/ICONV.OBJ", "common/lib/iconv.obj"}, {"LIB/KMENU.OBJ", "common/lib/kmenu.obj"}, @@ -37,10 +47,10 @@ img_files = { {"MEDIA/IMGF/CEDG.OBJ", "common/media/ImgF/cEdg.obj"}, {"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"}, {"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"}, - {"MEDIA/PIXIESKN.PNG", PROGS .. "/cmm/pixie2/pixieskn.png"}, - {"NETWORK/FTPC.INI", PROGS .. "/network/ftpc/ftpc.ini"}, - {"NETWORK/FTPC_SYS.PNG", PROGS .. "/network/ftpc/ftpc_sys.png"}, - {"NETWORK/FTPC_NOD.PNG", PROGS .. "/network/ftpc/ftpc_nod.png"}, + {"MEDIA/PIXIESKN.PNG", SRC_PROGS .. "/cmm/pixie2/pixieskn.png"}, + {"NETWORK/FTPC.INI", SRC_PROGS .. "/network/ftpc/ftpc.ini"}, + {"NETWORK/FTPC_SYS.PNG", SRC_PROGS .. "/network/ftpc/ftpc_sys.png"}, + {"NETWORK/FTPC_NOD.PNG", SRC_PROGS .. "/network/ftpc/ftpc_nod.png"}, {"NETWORK/FTPD.INI", "common/network/ftpd.ini"}, {"NETWORK/KNMAP", "common/network/knmap"}, {"NETWORK/USERS.INI", "common/network/users.ini"}, @@ -48,12 +58,12 @@ img_files = { {"SETTINGS/APP_PLUS.INI", "common/settings/app_plus.ini"}, {"SETTINGS/ASSOC.INI", "common/settings/assoc.ini"}, {"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"}, - {"SETTINGS/CEDIT.INI", PROGS .. "/develop/cedit/CEDIT.INI"}, + {"SETTINGS/CEDIT.INI", SRC_PROGS .. "/develop/cedit/CEDIT.INI"}, {"SETTINGS/DOCKY.INI", "common/settings/docky.ini"}, {"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"}, - {"SETTINGS/HA.CFG", PROGS .. "/other/ha/SETTINGS/HA.CFG"}, + {"SETTINGS/HA.CFG", SRC_PROGS .. "/other/ha/SETTINGS/HA.CFG"}, {"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"}, - {"SETTINGS/KEYMAP.KEY", PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"}, + {"SETTINGS/KEYMAP.KEY", SRC_PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"}, {"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"}, {"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"}, {"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"}, @@ -65,50 +75,50 @@ img_files = { -- For russian build, add russian-only files. if build_type == "rus" then tup.append_table(img_files, { - {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"}, - {"DEVELOP/BACKY", PROGS .. "/develop/backy/Backy_ru"}, + {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/rus/example.asm"}, + {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy_ru"}, {"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"}, {"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"}, {"GAMES/DESCENT", build_type .. "/games/descent"}, - {"SETTINGS/.shell", PROGS .. "/system/shell/bin/rus/.shell"}, + {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"}, {"SETTINGS/GAMES.INI", "rus/settings/games.ini"}, - {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, + {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/SYSPANEL.INI", "rus/settings/syspanel.ini"}, }) elseif build_type == "eng" then tup.append_table(img_files, { - {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, - {"DEVELOP/BACKY", PROGS .. "/develop/backy/Backy"}, + {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"}, + {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"GAMES/DESCENT", "common/games/descent"}, - {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, + {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"}, {"SETTINGS/GAMES.INI", "common/settings/games.ini"}, - {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, + {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"}, }) elseif build_type == "sp" then tup.append_table(img_files, { - {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, - {"DEVELOP/BACKY", PROGS .. "/develop/backy/Backy"}, + {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"}, + {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"GAMES/DESCENT", "common/games/descent"}, - {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, + {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"}, {"SETTINGS/GAMES.INI", "common/settings/games.ini"}, - {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, + {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"}, }) elseif build_type == "it" then tup.append_table(img_files, { - {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, - {"DEVELOP/BACKY", PROGS .. "/develop/backy/Backy"}, + {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"}, + {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"GAMES/DESCENT", "common/games/descent"}, - {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, - {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey_it.ini"}, + {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"}, + {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey_it.ini"}, {"SETTINGS/GAMES.INI", "common/settings/games.ini"}, {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"}, }) else tup.append_table(img_files, { - {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"}, - {"DEVELOP/BACKY", PROGS .. "/develop/backy/Backy"}, + {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"}, + {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"}, {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, {"GAMES/DESCENT", "common/games/descent"}, - {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"}, + {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"}, {"SETTINGS/GAMES.INI", "common/settings/games.ini"}, - {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"}, + {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"}, {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"}, }) end @@ -132,77 +142,77 @@ extra_files = { {"/", "common/distr_data/KolibriOS_icon.ico"}, {"Docs/stack.txt", "../kernel/trunk/docs/stack.txt"}, {"HD_Load/9x2klbr/", "common/HD_load/9x2klbr/LDKLBR.VXD"}, - {"HD_Load/MeOSLoad/", PROGS .. "/hd_load/meosload/AUTOEXEC.BAT"}, - {"HD_Load/MeOSLoad/", PROGS .. "/hd_load/meosload/CONFIG.SYS"}, - {"HD_Load/MeOSLoad/", PROGS .. "/hd_load/meosload/L_readme.txt"}, - {"HD_Load/MeOSLoad/", PROGS .. "/hd_load/meosload/L_readme_Win.txt"}, - {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/vista_install.bat"}, - {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/vista_remove.bat"}, + {"HD_Load/MeOSLoad/", SRC_PROGS .. "/hd_load/meosload/AUTOEXEC.BAT"}, + {"HD_Load/MeOSLoad/", SRC_PROGS .. "/hd_load/meosload/CONFIG.SYS"}, + {"HD_Load/MeOSLoad/", SRC_PROGS .. "/hd_load/meosload/L_readme.txt"}, + {"HD_Load/MeOSLoad/", SRC_PROGS .. "/hd_load/meosload/L_readme_Win.txt"}, + {"HD_Load/mtldr/", SRC_PROGS .. "/hd_load/mtldr/vista_install.bat"}, + {"HD_Load/mtldr/", SRC_PROGS .. "/hd_load/mtldr/vista_remove.bat"}, {"HD_Load/", "common/HD_load/memdisk"}, - {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/usb_boot.rtf"}, - {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/usb_boot_866.txt"}, - {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/usb_boot_1251.txt"}, - {"kolibrios/3D/info3ds/INFO3DS.INI", PROGS .. "/develop/info3ds/info3ds.ini"}, - {"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/*"}, + {"HD_Load/USB_boot_old/", SRC_PROGS .. "/hd_load/usb_boot_old/usb_boot.rtf"}, + {"HD_Load/USB_boot_old/", SRC_PROGS .. "/hd_load/usb_boot_old/usb_boot_866.txt"}, + {"HD_Load/USB_boot_old/", SRC_PROGS .. "/hd_load/usb_boot_old/usb_boot_1251.txt"}, + {"kolibrios/3D/info3ds/INFO3DS.INI", SRC_PROGS .. "/develop/info3ds/info3ds.ini"}, + {"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/models/", "../programs/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"}, - {"kolibrios/3D/voxel_editor/HOUSE1.VOX", PROGS .. "/media/voxel_editor/trunk/house1.vox"}, - {"kolibrios/3D/voxel_editor/HOUSE2.VOX", PROGS .. "/media/voxel_editor/trunk/house2.vox"}, - {"kolibrios/3D/voxel_editor/SQUIRREL.VOX", PROGS .. "/media/voxel_editor/trunk/squirrel.vox"}, - {"kolibrios/3D/voxel_utilites/VOX_MOVER.INI" , PROGS .. "/media/voxel_editor/utilites/vox_mover.ini"}, - {"kolibrios/3D/FONT8X9.BMP", PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, - {"kolibrios/3D/TOOLB_1.PNG", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png"}, - {"kolibrios/3D/TEST_GLU1", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu1"}, - {"kolibrios/3D/TEST_GLU2", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu2"}, - {"kolibrios/3D/TEXT_2.PNG", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/text_2.png"}, + {"kolibrios/3D/voxel_editor/VOX_EDITOR.INI", SRC_PROGS .. "/media/voxel_editor/trunk/vox_editor.ini"}, + {"kolibrios/3D/voxel_editor/HOUSE1.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/house1.vox"}, + {"kolibrios/3D/voxel_editor/HOUSE2.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/house2.vox"}, + {"kolibrios/3D/voxel_editor/SQUIRREL.VOX", SRC_PROGS .. "/media/voxel_editor/trunk/squirrel.vox"}, + {"kolibrios/3D/voxel_utilites/VOX_MOVER.INI" , SRC_PROGS .. "/media/voxel_editor/utilites/vox_mover.ini"}, + {"kolibrios/3D/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, + {"kolibrios/3D/TOOLB_1.PNG", SRC_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png"}, + {"kolibrios/3D/TEST_GLU1", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu1"}, + {"kolibrios/3D/TEST_GLU2", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu2"}, + {"kolibrios/3D/TEXT_2.PNG", SRC_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/text_2.png"}, {"kolibrios/demos/ak47.lif", "common/demos/ak47.lif"}, {"kolibrios/demos/life2", "common/demos/life2"}, {"kolibrios/demos/relay.lif", "common/demos/relay.lif"}, {"kolibrios/demos/rpento.lif", "common/demos/rpento.lif"}, - {"kolibrios/develop/c--/c--.elf", PROGS .. "/cmm/c--/c--.elf"}, - {"kolibrios/develop/c--/c--.exe", PROGS .. "/cmm/c--/c--.exe"}, - {"kolibrios/develop/c--/c--.ini", PROGS .. "/cmm/c--/c--.ini"}, - {"kolibrios/develop/c--/manual_c--.htm", PROGS .. "/cmm/c--/manual_c--.htm"}, + {"kolibrios/develop/c--/c--.elf", SRC_PROGS .. "/cmm/c--/c--.elf"}, + {"kolibrios/develop/c--/c--.exe", SRC_PROGS .. "/cmm/c--/c--.exe"}, + {"kolibrios/develop/c--/c--.ini", SRC_PROGS .. "/cmm/c--/c--.ini"}, + {"kolibrios/develop/c--/manual_c--.htm", SRC_PROGS .. "/cmm/c--/manual_c--.htm"}, {"kolibrios/develop/fpc/", "common/develop/fpc/*"}, - {"kolibrios/develop/fpc/examples/", PROGS .. "/develop/fp/examples/src/*"}, + {"kolibrios/develop/fpc/examples/", "../programs/develop/fp/examples/src/*"}, {"kolibrios/develop/fpc/examples/build.sh", "common/develop/fpc/build.sh"}, - {"kolibrios/develop/oberon07/", PROGS .. "/develop/oberon07/*"}, - {"kolibrios/develop/oberon07/doc/", PROGS .. "/develop/oberon07/doc/*"}, - {"kolibrios/develop/oberon07/lib/KolibriOS/", PROGS .. "/develop/oberon07/lib/KolibriOS/*"}, - {"kolibrios/develop/oberon07/samples/", PROGS .. "/develop/oberon07/samples/*"}, - {"kolibrios/develop/tcc/lib/", PROGS .. "/develop/ktcc/trunk/bin/lib/*"}, - {"kolibrios/develop/tcc/include/", PROGS .. "/develop/ktcc/trunk/libc.obj/include/*"}, - {"kolibrios/develop/tcc/include/clayer/", PROGS .. "/develop/ktcc/trunk/libc.obj/include/clayer/*"}, - {"kolibrios/develop/tcc/include/cryptal/", PROGS .. "/develop/ktcc/trunk/libc.obj/include/cryptal/*"}, - {"kolibrios/develop/tcc/include/sys/", PROGS .. "/develop/ktcc/trunk/libc.obj/include/sys/*"}, + {"kolibrios/develop/oberon07/", "../programs/develop/oberon07/*"}, + {"kolibrios/develop/oberon07/doc/", "../programs/develop/oberon07/doc/*"}, + {"kolibrios/develop/oberon07/lib/KolibriOS/", "../programs/develop/oberon07/lib/KolibriOS/*"}, + {"kolibrios/develop/oberon07/samples/", SRC_PROGS .. "/develop/oberon07/samples/*"}, + {"kolibrios/develop/tcc/lib/", SRC_PROGS .. "/develop/ktcc/trunk/bin/lib/*"}, + {"kolibrios/develop/tcc/include/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/include/*"}, + {"kolibrios/develop/tcc/include/clayer/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/include/clayer/*"}, + {"kolibrios/develop/tcc/include/cryptal/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/include/cryptal/*"}, + {"kolibrios/develop/tcc/include/sys/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/include/sys/*"}, {"kolibrios/develop/tcc/include/SDL/", "../contrib/sdk/sources/SDL-1.2.2_newlib/include/*"}, - {"kolibrios/develop/tcc/samples/", PROGS .. "/develop/ktcc/trunk/libc.obj/samples/*.c"}, - {"kolibrios/develop/tcc/samples/", PROGS .. "/develop/ktcc/trunk/libc.obj/samples/*.sh"}, - {"kolibrios/develop/tcc/samples/clayer/", PROGS .. "/develop/ktcc/trunk/libc.obj/samples/clayer/*"}, - {"kolibrios/develop/utils/SPEDump", PROGS .. "/develop/SPEDump/SPEDump.kex"}, + {"kolibrios/develop/tcc/samples/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/samples/*.c"}, + {"kolibrios/develop/tcc/samples/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/samples/*.sh"}, + {"kolibrios/develop/tcc/samples/clayer/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/samples/clayer/*"}, + {"kolibrios/develop/utils/SPEDump", SRC_PROGS .. "/develop/SPEDump/SPEDump.kex"}, {"kolibrios/emul/", "common/emul/*"}, {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"}, - {"kolibrios/emul/e80/readme.txt", PROGS .. "/emulator/e80/trunk/readme.txt"}, - {"kolibrios/emul/e80/keyboard.png", PROGS .. "/emulator/e80/trunk/keyboard.png"}, - {"kolibrios/emul/fceu/fceu", PROGS .. "/emulator/fceu/fceu"}, - {"kolibrios/emul/fceu/FCEU ReadMe.txt", PROGS .. "/emulator/fceu/FCEU ReadMe.txt"}, - {"kolibrios/emul/chip8/chip8", PROGS .. "/emulator/chip8/chip8"}, - {"kolibrios/emul/chip8/readme.txt", PROGS .. "/emulator/chip8/readme.txt"}, - {"kolibrios/emul/chip8/roms/", PROGS .. "/emulator/chip8/roms/*"}, - {"kolibrios/emul/kwine/kwine", PROGS .. "/emulator/kwine/bin/kwine"}, - {"kolibrios/emul/kwine/lib/", PROGS .. "/emulator/kwine/bin/lib/*"}, + {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/trunk/readme.txt"}, + {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/trunk/keyboard.png"}, + {"kolibrios/emul/fceu/fceu", SRC_PROGS .. "/emulator/fceu/fceu"}, + {"kolibrios/emul/fceu/FCEU ReadMe.txt", SRC_PROGS .. "/emulator/fceu/FCEU ReadMe.txt"}, + {"kolibrios/emul/chip8/chip8", VAR_PROGS .. "/emulator/chip8/chip8"}, + {"kolibrios/emul/chip8/readme.txt", SRC_PROGS .. "/emulator/chip8/readme.txt"}, + {"kolibrios/emul/chip8/roms/", SRC_PROGS .. "/emulator/chip8/roms/*"}, + {"kolibrios/emul/kwine/kwine", SRC_PROGS .. "/emulator/kwine/bin/kwine"}, + {"kolibrios/emul/kwine/lib/", SRC_PROGS .. "/emulator/kwine/bin/lib/*"}, {"kolibrios/emul/uarm/", "common/emul/uarm/*"}, {"kolibrios/emul/zsnes/", "common/emul/zsnes/*"}, {"kolibrios/games/BabyPainter", "common/games/BabyPainter"}, - {"kolibrios/games/bomber/ackack.bmp", PROGS .. "/games/bomber/ackack.bmp"}, - {"kolibrios/games/bomber/bomb.bmp", PROGS .. "/games/bomber/bomb.bmp"}, - {"kolibrios/games/bomber/plane.bmp", PROGS .. "/games/bomber/plane.bmp"}, - {"kolibrios/games/bomber/tile.bmp", PROGS .. "/games/bomber/tile.bmp"}, + {"kolibrios/games/bomber/ackack.bmp", SRC_PROGS .. "/games/bomber/ackack.bmp"}, + {"kolibrios/games/bomber/bomb.bmp", SRC_PROGS .. "/games/bomber/bomb.bmp"}, + {"kolibrios/games/bomber/plane.bmp", SRC_PROGS .. "/games/bomber/plane.bmp"}, + {"kolibrios/games/bomber/tile.bmp", SRC_PROGS .. "/games/bomber/tile.bmp"}, {"kolibrios/games/doom1/", "common/games/doom/*"}, {"kolibrios/games/fara/fara.gfx", "common/games/fara.gfx"}, {"kolibrios/games/jumpbump/", "common/games/jumpbump/*"}, @@ -217,9 +227,9 @@ extra_files = { {"kolibrios/games/pig/", "common/games/pig/*"}, {"kolibrios/games/soko/", "common/games/soko/*"}, {"kolibrios/games/fridge/", "common/games/fridge/*"}, - {"kolibrios/games/the_bus/menu.png", PROGS .. "/cmm/the_bus/menu.png"}, - {"kolibrios/games/the_bus/objects.png", PROGS .. "/cmm/the_bus/objects.png"}, - {"kolibrios/games/the_bus/road.png", PROGS .. "/cmm/the_bus/road.png"}, + {"kolibrios/games/the_bus/menu.png", SRC_PROGS .. "/cmm/the_bus/menu.png"}, + {"kolibrios/games/the_bus/objects.png", SRC_PROGS .. "/cmm/the_bus/objects.png"}, + {"kolibrios/games/the_bus/road.png", SRC_PROGS .. "/cmm/the_bus/road.png"}, {"kolibrios/grafx2/fonts/", "common/media/grafx2/fonts/*"}, {"kolibrios/grafx2/scripts/", "common/media/grafx2/scripts/libs/*"}, {"kolibrios/grafx2/scripts/libs/", "common/media/grafx2/scripts/*"}, @@ -264,41 +274,41 @@ extra_files = { {"kolibrios/media/minimp3", "common/media/minimp3"}, {"kolibrios/media/updf", "common/media/updf"}, {"kolibrios/media/vttf", "common/media/vttf"}, - {"kolibrios/media/beat/Beat", PROGS .. "/media/Beat/Beat"}, - {"kolibrios/media/beat/Beep1.raw", PROGS .. "/media/Beat/Beep1.raw"}, - {"kolibrios/media/beat/Beep2.raw", PROGS .. "/media/Beat/Beep2.raw"}, - {"kolibrios/media/beat/PlayNote", PROGS .. "/media/Beat/PlayNote/PlayNote"}, - {"kolibrios/media/beat/Readme-en.txt", PROGS .. "/media/Beat/Readme-en.txt"}, - {"kolibrios/media/beat/Readme-ru.txt", PROGS .. "/media/Beat/Readme-ru.txt"}, - {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"}, - {"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"}, + {"kolibrios/media/beat/Beat", SRC_PROGS .. "/media/Beat/Beat"}, + {"kolibrios/media/beat/Beep1.raw", SRC_PROGS .. "/media/Beat/Beep1.raw"}, + {"kolibrios/media/beat/Beep2.raw", SRC_PROGS .. "/media/Beat/Beep2.raw"}, + {"kolibrios/media/beat/PlayNote", SRC_PROGS .. "/media/Beat/PlayNote/PlayNote"}, + {"kolibrios/media/beat/Readme-en.txt", SRC_PROGS .. "/media/Beat/Readme-en.txt"}, + {"kolibrios/media/beat/Readme-ru.txt", SRC_PROGS .. "/media/Beat/Readme-ru.txt"}, + {"kolibrios/media/zsea/zsea.ini", SRC_PROGS .. "/media/zsea/zSea.ini"}, + {"kolibrios/media/zsea/buttons/buttons.png", SRC_PROGS .. "/media/zsea/buttons.png"}, {"kolibrios/netsurf/netsurf", "common/network/netsurf/netsurf"}, {"kolibrios/netsurf/res/", "common/network/netsurf/res/*"}, {"kolibrios/res/skins/", "../skins/authors.txt"}, {"kolibrios/res/templates/", "common/templates/*"}, - {"kolibrios/res/templates/", PROGS .. "/emulator/e80/trunk/games/*"}, + {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/trunk/games/*"}, {"kolibrios/res/templates/NES/", "common/templates/NES/*"}, {"kolibrios/res/wallpapers/", "common/wallpapers/*"}, {"kolibrios/res/system/", build_type .. "/settings/kolibri.lbl"}, {"kolibrios/utils/vmode", "common/vmode"}, {"kolibrios/utils/texture", "common/utils/texture"}, - {"kolibrios/utils/cnc_editor/cnc_editor", PROGS .. "/other/cnc_editor/cnc_editor"}, - {"kolibrios/utils/cnc_editor/kolibri.NC", PROGS .. "/other/cnc_editor/kolibri.NC"}, + {"kolibrios/utils/cnc_editor/cnc_editor", VAR_PROGS .. "/other/cnc_editor/cnc_editor"}, + {"kolibrios/utils/cnc_editor/kolibri.NC", SRC_PROGS .. "/other/cnc_editor/kolibri.NC"}, {"kolibrios/utils/kfm/kfm.ini", "common/File Managers/kfm.ini"}, - {"kolibrios/utils/kfm/kfm_keys_eng.txt", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, - {"kolibrios/utils/kfm/kfm_keys_rus.txt", PROGS .. "/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt"}, + {"kolibrios/utils/kfm/kfm_keys_eng.txt", SRC_PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"}, + {"kolibrios/utils/kfm/kfm_keys_rus.txt", SRC_PROGS .. "/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt"}, {"kolibrios/utils/fNav/", "common/File Managers/fNav/*"}, {"kolibrios/utils/NDN/", "common/File Managers/ndn/*"}, {"kolibrios/utils/NDN/COLORS/", "common/File Managers/ndn/COLORS/*"}, {"kolibrios/utils/NDN/XLT/", "common/File Managers/ndn/XLT/*"}, - {"kolibrios/utils/tedit/t_edit.ini", PROGS .. "/other/t_edit/t_edit.ini"}, - {"kolibrios/utils/tedit/info/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"}, - {"kolibrios/utils/tedit/info/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"}, - {"kolibrios/utils/tedit/info/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"}, - {"kolibrios/utils/tedit/info/CPP_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"}, - {"kolibrios/utils/tedit/info/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"}, - {"kolibrios/utils/tedit/info/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"}, - {"kolibrios/utils/tedit/info/INI.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"}, + {"kolibrios/utils/tedit/t_edit.ini", SRC_PROGS .. "/other/t_edit/t_edit.ini"}, + {"kolibrios/utils/tedit/info/ASM.SYN", VAR_PROGS .. "/other/t_edit/info/asm.syn"}, + {"kolibrios/utils/tedit/info/CPP_CLA.SYN", VAR_PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"}, + {"kolibrios/utils/tedit/info/CPP_DAR.SYN", VAR_PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"}, + {"kolibrios/utils/tedit/info/CPP_DEF.SYN", VAR_PROGS .. "/other/t_edit/info/cpp_kol_def.syn"}, + {"kolibrios/utils/tedit/info/DEFAULT.SYN", VAR_PROGS .. "/other/t_edit/info/default.syn"}, + {"kolibrios/utils/tedit/info/HTML.SYN", VAR_PROGS .. "/other/t_edit/info/html.syn"}, + {"kolibrios/utils/tedit/info/INI.SYN", VAR_PROGS .. "/other/t_edit/info/ini_files.syn"}, } if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, @@ -307,44 +317,44 @@ if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/hot_keys.txt", build_type .. "/docs/HOT_KEYS.TXT"}, {"Docs/cp866/install.txt", build_type .. "/docs/INSTALL.TXT"}, {"Docs/cp866/credits.txt", build_type .. "/docs/CREDITS.TXT"}, - {"Docs/cp866/sysfuncr.txt", PROGS .. "/system/docpack/trunk/SYSFUNCR.TXT"}, + {"Docs/cp866/sysfuncr.txt", SRC_PROGS .. "/system/docpack/trunk/SYSFUNCR.TXT"}, {"Docs/cp1251/config.txt", build_type .. "/docs/CONFIG.WIN.TXT", cp1251_from = build_type .. "/docs/CONFIG.TXT"}, {"Docs/cp1251/gnu.txt", build_type .. "/docs/GNU.WIN.TXT", cp1251_from = build_type .. "/docs/GNU.TXT"}, {"Docs/cp1251/history.txt", build_type .. "/docs/HISTORY.WIN.TXT", cp1251_from = build_type .. "/docs/HISTORY.TXT"}, {"Docs/cp1251/hot_keys.txt", build_type .. "/docs/HOT_KEYS.WIN.TXT", cp1251_from = build_type .. "/docs/HOT_KEYS.TXT"}, {"Docs/cp1251/install.txt", build_type .. "/docs/INSTALL.WIN.TXT", cp1251_from = build_type .. "/docs/INSTALL.TXT"}, {"Docs/cp1251/credits.txt", build_type .. "/docs/CREDITS.WIN.TXT", cp1251_from = build_type .. "/docs/CREDITS.TXT"}, - {"Docs/cp1251/sysfuncr.txt", build_type .. "/docs/SYSFUNCR.WIN.TXT", cp1251_from = PROGS .. "/system/docpack/trunk/SYSFUNCR.TXT"}, - {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme_dos.txt"}, - {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme_win.txt"}, - {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/install.txt"}, - {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/readme.txt"}, + {"Docs/cp1251/sysfuncr.txt", build_type .. "/docs/SYSFUNCR.WIN.TXT", cp1251_from = SRC_PROGS .. "/system/docpack/trunk/SYSFUNCR.TXT"}, + {"HD_Load/9x2klbr/", SRC_PROGS .. "/hd_load/9x2klbr/readme_dos.txt"}, + {"HD_Load/9x2klbr/", SRC_PROGS .. "/hd_load/9x2klbr/readme_win.txt"}, + {"HD_Load/mtldr/", SRC_PROGS .. "/hd_load/mtldr/install.txt"}, + {"HD_Load/USB_Boot/", SRC_PROGS .. "/hd_load/usb_boot/readme.txt"}, {"kolibrios/games/ataka", "common/games/ataka/ataka_ru"}, - {"kolibrios/games/Dungeons/Resources/Textures/Environment/", PROGS .. "/games/Dungeons/Resources/Textures/Environment/*"}, - {"kolibrios/games/Dungeons/Resources/Textures/Objects/", PROGS .. "/games/Dungeons/Resources/Textures/Objects/*"}, - {"kolibrios/games/Dungeons/Resources/Textures/HUD/", PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"}, - {"kolibrios/games/Dungeons/Resources/Textures/", PROGS .. "/games/Dungeons/Resources/Textures/Licenses.txt"}, - {"kolibrios/games/Dungeons/", PROGS .. "/games/Dungeons/readme_ru.txt"}, + {"kolibrios/games/Dungeons/Resources/Textures/Environment/", SRC_PROGS .. "/games/Dungeons/Resources/Textures/Environment/*"}, + {"kolibrios/games/Dungeons/Resources/Textures/Objects/", SRC_PROGS .. "/games/Dungeons/Resources/Textures/Objects/*"}, + {"kolibrios/games/Dungeons/Resources/Textures/HUD/", SRC_PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"}, + {"kolibrios/games/Dungeons/Resources/Textures/", SRC_PROGS .. "/games/Dungeons/Resources/Textures/Licenses.txt"}, + {"kolibrios/games/Dungeons/", SRC_PROGS .. "/games/Dungeons/readme_ru.txt"}, {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_ru"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/whowtbam"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"}, - {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"}, + {"kolibrios/media/zsea/zsea_keys.txt", SRC_PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"}, {"kolibrios/res/guide/", build_type .. "/docs/guide/*"}, - {"kolibrios/develop/tcc/doc/", PROGS .. "/develop/ktcc/trunk/bin/doc/ru/*"}, + {"kolibrios/develop/tcc/doc/", SRC_PROGS .. "/develop/ktcc/trunk/bin/doc/ru/*"}, }) else tup.append_table(extra_files, { {"Docs/config.txt", build_type .. "/docs/CONFIG.TXT"}, {"Docs/copying.txt", build_type .. "/docs/COPYING.TXT"}, {"Docs/hot_keys.txt", build_type .. "/docs/HOT_KEYS.TXT"}, {"Docs/install.txt", build_type .. "/docs/INSTALL.TXT"}, {"Docs/credits.txt", build_type .. "/docs/CREDITS.TXT"}, - {"Docs/sysfuncs.txt", PROGS .. "/system/docpack/trunk/SYSFUNCS.TXT"}, - {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme.txt"}, - {"HD_Load/mtldr/install.txt", PROGS .. "/hd_load/mtldr/install_eng.txt"}, - {"HD_Load/USB_Boot/readme.txt", PROGS .. "/hd_load/usb_boot/readme_eng.txt"}, + {"Docs/sysfuncs.txt", VAR_PROGS .. "/system/docpack/trunk/SYSFUNCS.TXT"}, + {"HD_Load/9x2klbr/", SRC_PROGS .. "/hd_load/9x2klbr/readme.txt"}, + {"HD_Load/mtldr/install.txt", SRC_PROGS .. "/hd_load/mtldr/install_eng.txt"}, + {"HD_Load/USB_Boot/readme.txt", SRC_PROGS .. "/hd_load/usb_boot/readme_eng.txt"}, {"kolibrios/games/ataka", "common/games/ataka/ataka_en"}, {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_en"}, - {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"}, - {"kolibrios/develop/tcc/doc/", PROGS .. "/develop/ktcc/trunk/bin/doc/en/*"}, + {"kolibrios/media/zsea/zsea_keys.txt", SRC_PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"}, + {"kolibrios/develop/tcc/doc/", SRC_PROGS .. "/develop/ktcc/trunk/bin/doc/en/*"}, }) end --[[ Files to be included in distribution kit outside of kolibri.img, but not kolibri.iso. @@ -378,243 +388,243 @@ end -- Programs that require FASM to compile. if tup.getconfig('NO_FASM') ~= 'full' then tup.append_table(img_files, { - {"KERNEL.MNT", "../kernel/trunk/kernel.mnt"}, - {"@DOCKY", PROGS .. "/system/docky/trunk/docky"}, - {"@HA", PROGS .. "/other/ha/HA"}, - {"@ICON", PROGS .. "/system/icon_new/icon"}, - {"@MENU", PROGS .. "/system/menu/trunk/menu"}, - {"@NOTIFY", PROGS .. "/system/notify3/notify"}, - {"@OPEN", PROGS .. "/system/open/open"}, - {"@TASKBAR", PROGS .. "/system/taskbar/trunk/TASKBAR"}, - {"@SS", PROGS .. "/system/scrsaver/scrsaver"}, - {"@VOLUME", PROGS .. "/media/volume/volume"}, - {"HACONFIG", PROGS .. "/other/ha/HACONFIG"}, - {"APM", PROGS .. "/system/apm/apm"}, - {"CALC", PROGS .. "/other/calc/trunk/calc"}, - {"CALENDAR", PROGS .. "/system/calendar/trunk/calendar"}, - {"COLRDIAL", PROGS .. "/system/colrdial/color_dialog"}, - {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"}, - {"CPU", PROGS .. "/system/cpu/trunk/cpu"}, - {"CPUID", PROGS .. "/testing/cpuid/trunk/CPUID"}, - {"DOCPACK", PROGS .. "/system/docpack/trunk/docpack"}, - {"DEFAULT.SKN", "../skins/Leency/Shkvorka/Shkvorka.skn"}, - {"DISPTEST", PROGS .. "/testing/disptest/trunk/disptest"}, - {"END", PROGS .. "/system/end/light/end"}, - {"ESKIN", PROGS .. "/system/eskin/trunk/eskin"}, - {"FSPEED", PROGS .. "/testing/fspeed/fspeed"}, - {"GMON", PROGS .. "/system/gmon/gmon"}, - {"HDD_INFO", PROGS .. "/system/hdd_info/trunk/hdd_info"}, - {"KBD", PROGS .. "/testing/kbd/trunk/kbd"}, - {"KPACK", PROGS .. "/other/kpack/trunk/kpack"}, - {"LAUNCHER", PROGS .. "/system/launcher/trunk/launcher"}, - {"LOADDRV", PROGS .. "/system/loaddrv/loaddrv"}, - {"MAGNIFY", PROGS .. "/demos/magnify/trunk/magnify"}, - {"MGB", PROGS .. "/testing/mgb/trunk/mgb"}, - {"MOUSEMUL", PROGS .. "/system/mousemul/trunk/mousemul"}, - {"MADMOUSE", PROGS .. "/other/madmouse/madmouse"}, - {"MYKEY", PROGS .. "/system/MyKey/trunk/MyKey"}, - {"PCIDEV", PROGS .. "/testing/pcidev/trunk/PCIDEV"}, - {"RDSAVE", PROGS .. "/system/rdsave/trunk/rdsave"}, - {"RTFREAD", PROGS .. "/other/rtfread/trunk/rtfread"}, - {"SEARCHAP", PROGS .. "/system/searchap/searchap"}, - {"SCRSHOOT", PROGS .. "/media/scrshoot/scrshoot"}, - {"SETUP", PROGS .. "/system/setup/trunk/setup"}, - {"SKINCFG", PROGS .. "/system/skincfg/trunk/skincfg"}, - {"TERMINAL", PROGS .. "/system/terminal/terminal"}, - {"TEST", PROGS .. "/testing/protection/trunk/test"}, - {"TINYPAD", PROGS .. "/develop/tinypad/trunk/tinypad"}, - {"UNZ", PROGS .. "/fs/unz/unz"}, - {"ZKEY", PROGS .. "/system/zkey/trunk/ZKEY"}, - {"3D/3DWAV", PROGS .. "/demos/3dwav/trunk/3dwav"}, - {"3D/CROWNSCR", PROGS .. "/demos/crownscr/trunk/crownscr"}, - {"3D/3DCUBE2", PROGS .. "/demos/3dcube2/trunk/3DCUBE2"}, - {"3D/FREE3D04", PROGS .. "/demos/free3d04/trunk/free3d04"}, - {"3D/GEARS", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"}, - {"3D/RAY", PROGS .. "/demos/ray/ray"}, - {"3D/VIEW3DS", PROGS .. "/demos/view3ds/view3ds"}, - {"DEMOS/BCDCLK", PROGS .. "/demos/bcdclk/trunk/bcdclk"}, - {"DEMOS/BUDHBROT", PROGS .. "/demos/buddhabrot/trunk/buddhabrot"}, - {"DEMOS/EYES", PROGS .. "/demos/eyes/trunk/eyes"}, - {"DEMOS/FIREWORK", PROGS .. "/demos/firework/trunk/firework"}, - {"DEMOS/MOVBACK", PROGS .. "/demos/movback/trunk/movback"}, - {"DEMOS/PLASMA", PROGS .. "/demos/plasma/trunk/plasma"}, - {"DEMOS/SPIRAL", PROGS .. "/demos/spiral/spiral"}, - {"DEMOS/TINYFRAC", PROGS .. "/demos/tinyfrac/trunk/tinyfrac"}, - {"DEMOS/TRANTEST", PROGS .. "/demos/trantest/trunk/trantest"}, - {"DEMOS/TUBE", PROGS .. "/demos/tube/trunk/tube"}, - {"DEMOS/UNVWATER", PROGS .. "/demos/unvwater/trunk/unvwater"}, - {"DEMOS/WEB", PROGS .. "/demos/web/trunk/web"}, - {"DEMOS/ZEROLINE", PROGS .. "/demos/zeroline/trunk/zeroline"}, - {"DEVELOP/ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"}, - {"DEVELOP/BOARD", PROGS .. "/system/board/trunk/board"}, - {"DEVELOP/CEDIT", PROGS .. "/develop/cedit/CEDIT"}, - {"DEVELOP/COBJ", PROGS .. "/develop/cObj/trunk/cObj"}, - {"DEVELOP/ENTROPYV", PROGS .. "/develop/entropyview/entropyview"}, - {"DEVELOP/FASM", PROGS .. "/develop/fasm/1.73/fasm"}, - {"DEVELOP/H2D2B", PROGS .. "/develop/h2d2b/trunk/h2d2b"}, - {"DEVELOP/HEED", PROGS .. "/develop/heed/trunk/heed"}, - {"DEVELOP/KEYASCII", PROGS .. "/develop/keyascii/trunk/keyascii"}, - {"DEVELOP/MTDBG", PROGS .. "/develop/mtdbg/mtdbg"}, - {"DEVELOP/SCANCODE", PROGS .. "/develop/scancode/trunk/scancode"}, - {"DEVELOP/EXAMPLES/CIRCLE", PROGS .. "/develop/examples/circle/trunk/circle"}, - {"DEVELOP/EXAMPLES/COLORREF", PROGS .. "/demos/colorref/trunk/colorref"}, - {"DEVELOP/EXAMPLES/CONGET", PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, - {"DEVELOP/EXAMPLES/CSLIDE", PROGS .. "/demos/cslide/trunk/cslide"}, - {"DEVELOP/EXAMPLES/THREAD", PROGS .. "/develop/examples/thread/trunk/thread"}, - {"DEVELOP/EXAMPLES/USE_MB", PROGS .. "/demos/use_mb/use_mb"}, - {"File Managers/KFAR", PROGS .. "/fs/kfar/trunk/kfar"}, - {"File Managers/OPENDIAL", PROGS .. "/fs/opendial/opendial"}, - {"GAMES/15", PROGS .. "/games/15/trunk/15"}, - {"GAMES/FREECELL", PROGS .. "/games/freecell/freecell"}, - {"GAMES/GOMOKU", PROGS .. "/games/gomoku/trunk/gomoku"}, - {"GAMES/LIGHTS", PROGS .. "/games/sq_game/trunk/SQ_GAME"}, - {"GAMES/LINES", PROGS .. "/games/lines/lines"}, - {"GAMES/MSQUARE", PROGS .. "/games/MSquare/trunk/MSquare"}, - {"GAMES/PIPES", PROGS .. "/games/pipes/pipes"}, - {"GAMES/PONG", PROGS .. "/games/pong/trunk/pong"}, - {"GAMES/PONG3", PROGS .. "/games/pong3/trunk/pong3"}, - {"GAMES/RSQUARE", PROGS .. "/games/rsquare/trunk/rsquare"}, - {"GAMES/SNAKE", PROGS .. "/games/snake/trunk/snake"}, - {"GAMES/SUDOKU", PROGS .. "/games/sudoku/trunk/sudoku"}, - {"GAMES/SW", PROGS .. "/games/sw/trunk/sw"}, - {"GAMES/TANKS", PROGS .. "/games/tanks/trunk/tanks"}, - {"GAMES/TETRIS", PROGS .. "/games/tetris/trunk/tetris"}, - {"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/CONSOLE.OBJ", PROGS .. "/develop/libraries/console_coff/console.obj"}, - {"LIB/CNV_PNG.OBJ", PROGS .. "/media/zsea/plugins/png/cnv_png.obj"}, - {"LIB/DLL.OBJ", PROGS .. "/develop/libraries/dll/dll.obj"}, - {"LIB/HTTP.OBJ", PROGS .. "/develop/libraries/http/http.obj"}, - {"LIB/LIBCRASH.OBJ", PROGS .. "/develop/libraries/libcrash/libcrash.obj"}, - {"LIB/LIBGFX.OBJ", PROGS .. "/develop/libraries/libs-dev/libgfx/libgfx.obj"}, - {"LIB/LIBIMG.OBJ", PROGS .. "/develop/libraries/libs-dev/libimg/libimg.obj"}, - {"LIB/LIBINI.OBJ", PROGS .. "/develop/libraries/libs-dev/libini/libini.obj"}, - {"LIB/LIBIO.OBJ", PROGS .. "/develop/libraries/libs-dev/libio/libio.obj"}, - {"LIB/MSGBOX.OBJ", PROGS .. "/develop/libraries/msgbox/msgbox.obj"}, - {"LIB/NETWORK.OBJ", PROGS .. "/develop/libraries/network/network.obj"}, - {"LIB/PROC_LIB.OBJ", PROGS .. "/develop/libraries/proc_lib/trunk/proc_lib.obj"}, - {"LIB/RASTERWORKS.OBJ", PROGS .. "/develop/libraries/fontRasterWorks(unicode)/RasterWorks.obj"}, - {"LIB/SORT.OBJ", PROGS .. "/develop/libraries/sorter/sort.obj"}, - {"LIB/TINYGL.OBJ", PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"}, - {"MEDIA/ANIMAGE", PROGS .. "/media/animage/trunk/animage"}, - {"MEDIA/KIV", PROGS .. "/media/kiv/trunk/kiv"}, - {"MEDIA/LISTPLAY", PROGS .. "/media/listplay/trunk/listplay"}, - {"MEDIA/MIDAMP", PROGS .. "/media/midamp/trunk/midamp"}, - {"MEDIA/MP3INFO", PROGS .. "/media/mp3info/mp3info"}, - {"MEDIA/PALITRA", PROGS .. "/media/palitra/trunk/palitra"}, - {"MEDIA/PIANO", PROGS .. "/media/piano/piano"}, - {"MEDIA/STARTMUS", PROGS .. "/media/startmus/trunk/STARTMUS"}, - {"NETWORK/PING", PROGS .. "/network/ping/ping"}, - {"NETWORK/NETCFG", PROGS .. "/network/netcfg/netcfg"}, - {"NETWORK/NETSTAT", PROGS .. "/network/netstat/netstat"}, - {"NETWORK/NSINST", PROGS .. "/network/netsurf/nsinstall"}, - {"NETWORK/NSLOOKUP", PROGS .. "/network/nslookup/nslookup"}, - {"NETWORK/PASTA", PROGS .. "/network/pasta/pasta"}, - {"NETWORK/SYNERGYC", PROGS .. "/network/synergyc/synergyc"}, - {"NETWORK/SNTP", PROGS .. "/network/sntp/sntp"}, - {"NETWORK/TELNET", PROGS .. "/network/telnet/telnet"}, - {"NETWORK/@ZEROCONF", PROGS .. "/network/zeroconf/zeroconf"}, - {"NETWORK/FTPC", PROGS .. "/network/ftpc/ftpc"}, - {"NETWORK/FTPD", PROGS .. "/network/ftpd/ftpd"}, - {"NETWORK/TFTPC", PROGS .. "/network/tftpc/tftpc"}, - {"NETWORK/IRCC", PROGS .. "/network/ircc/ircc"}, - {"NETWORK/DOWNLOADER", PROGS .. "/network/downloader/downloader"}, - {"NETWORK/VNCC", PROGS .. "/network/vncc/vncc"}, - {"DRIVERS/VIDINTEL.SYS", "../drivers/video/vidintel.sys"}, - {"DRIVERS/3C59X.SYS", "../drivers/ethernet/3c59x.sys"}, - {"DRIVERS/AR81XX.SYS", "../drivers/ethernet/ar81xx.sys"}, - {"DRIVERS/DEC21X4X.SYS", "../drivers/ethernet/dec21x4x.sys"}, - {"DRIVERS/FORCEDETH.SYS", "../drivers/ethernet/forcedeth.sys"}, - {"DRIVERS/I8254X.SYS", "../drivers/ethernet/i8254x.sys"}, - {"DRIVERS/I8255X.SYS", "../drivers/ethernet/i8255x.sys"}, - {"DRIVERS/MTD80X.SYS", "../drivers/ethernet/mtd80x.sys"}, - {"DRIVERS/PCNET32.SYS", "../drivers/ethernet/pcnet32.sys"}, - {"DRIVERS/R6040.SYS", "../drivers/ethernet/R6040.sys"}, - {"DRIVERS/RHINE.SYS", "../drivers/ethernet/rhine.sys"}, - {"DRIVERS/RTL8029.SYS", "../drivers/ethernet/RTL8029.sys"}, - {"DRIVERS/RTL8139.SYS", "../drivers/ethernet/RTL8139.sys"}, - {"DRIVERS/RTL8169.SYS", "../drivers/ethernet/RTL8169.sys"}, - {"DRIVERS/SIS900.SYS", "../drivers/ethernet/sis900.sys"}, - {"DRIVERS/UHCI.SYS", "../drivers/usb/uhci.sys"}, - {"DRIVERS/OHCI.SYS", "../drivers/usb/ohci.sys"}, - {"DRIVERS/EHCI.SYS", "../drivers/usb/ehci.sys"}, - {"DRIVERS/USBHID.SYS", "../drivers/usb/usbhid/usbhid.sys"}, - {"DRIVERS/USBSTOR.SYS", "../drivers/usb/usbstor.sys"}, - {"DRIVERS/RDC.SYS", "../drivers/video/rdc.sys"}, - {"DRIVERS/COMMOUSE.SYS", "../drivers/mouse/commouse.sys"}, - {"DRIVERS/PS2MOUSE.SYS", "../drivers/mouse/ps2mouse4d/trunk/ps2mouse.sys"}, - {"DRIVERS/TMPDISK.SYS", "../drivers/disk/tmpdisk.sys"}, - {"DRIVERS/HDAUDIO.SYS", "../drivers/audio/intel_hda/hdaudio.sys"}, - {"DRIVERS/SB16.SYS", "../drivers/audio/sb16/sb16.sys"}, - {"DRIVERS/SOUND.SYS", "../drivers/audio/sound.sys"}, - {"DRIVERS/INFINITY.SYS", "../drivers/audio/infinity/infinity.sys"}, - {"DRIVERS/AC97.SYS", "../drivers/audio/ac97.sys"}, - {"DRIVERS/EMU10K1X.SYS", "../drivers/audio/emu10k1x.sys"}, - {"DRIVERS/FM801.SYS", "../drivers/audio/fm801.sys"}, - {"DRIVERS/VT823X.SYS", "../drivers/audio/vt823x.sys"}, - {"DRIVERS/SIS.SYS", "../drivers/audio/sis.sys"}, + {"KERNEL.MNT", VAR_PROGS .. "/../kernel/trunk/kernel.mnt"}, + {"@DOCKY", VAR_PROGS .. "/system/docky/trunk/docky"}, + {"@HA", VAR_PROGS .. "/other/ha/HA"}, + {"@ICON", VAR_PROGS .. "/system/icon_new/icon"}, + {"@MENU", VAR_PROGS .. "/system/menu/trunk/menu"}, + {"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"}, + {"@OPEN", VAR_PROGS .. "/system/open/open"}, + {"@TASKBAR", VAR_PROGS .. "/system/taskbar/trunk/TASKBAR"}, + {"@SS", VAR_PROGS .. "/system/scrsaver/scrsaver"}, + {"@VOLUME", VAR_PROGS .. "/media/volume/volume"}, + {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"}, + {"APM", VAR_PROGS .. "/system/apm/apm"}, + {"CALC", VAR_PROGS .. "/other/calc/trunk/calc"}, + {"CALENDAR", VAR_PROGS .. "/system/calendar/trunk/calendar"}, + {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"}, + {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"}, + {"CPU", VAR_PROGS .. "/system/cpu/trunk/cpu"}, + {"CPUID", VAR_PROGS .. "/testing/cpuid/trunk/CPUID"}, + {"DOCPACK", VAR_PROGS .. "/system/docpack/trunk/docpack"}, + {"DEFAULT.SKN", VAR_SKINS .. "/../skins/Leency/Shkvorka/Shkvorka.skn"}, + {"DISPTEST", VAR_PROGS .. "/testing/disptest/trunk/disptest"}, + {"END", VAR_PROGS .. "/system/end/light/end"}, + {"ESKIN", VAR_PROGS .. "/system/eskin/trunk/eskin"}, + {"FSPEED", VAR_PROGS .. "/testing/fspeed/fspeed"}, + {"GMON", VAR_PROGS .. "/system/gmon/gmon"}, + {"HDD_INFO", VAR_PROGS .. "/system/hdd_info/trunk/hdd_info"}, + {"KBD", VAR_PROGS .. "/testing/kbd/trunk/kbd"}, + {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"}, + {"LAUNCHER", VAR_PROGS .. "/system/launcher/trunk/launcher"}, + {"LOADDRV", VAR_PROGS .. "/system/loaddrv/loaddrv"}, + {"MAGNIFY", VAR_PROGS .. "/demos/magnify/trunk/magnify"}, + {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"}, + {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/trunk/mousemul"}, + {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"}, + {"MYKEY", VAR_PROGS .. "/system/MyKey/trunk/MyKey"}, + {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"}, + {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"}, + {"RTFREAD", VAR_PROGS .. "/other/rtfread/trunk/rtfread"}, + {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"}, + {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"}, + {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"}, + {"SKINCFG", VAR_PROGS .. "/system/skincfg/trunk/skincfg"}, + {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"}, + {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"}, + {"TINYPAD", VAR_PROGS .. "/develop/tinypad/trunk/tinypad"}, + {"UNZ", VAR_PROGS .. "/fs/unz/unz"}, + {"ZKEY", VAR_PROGS .. "/system/zkey/trunk/ZKEY"}, + {"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/trunk/3dwav"}, + {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/trunk/crownscr"}, + {"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/trunk/3DCUBE2"}, + {"3D/FREE3D04", VAR_PROGS .. "/demos/free3d04/trunk/free3d04"}, + {"3D/GEARS", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"}, + {"3D/RAY", VAR_PROGS .. "/demos/ray/ray"}, + {"3D/VIEW3DS", VAR_PROGS .. "/demos/view3ds/view3ds"}, + {"DEMOS/BCDCLK", VAR_PROGS .. "/demos/bcdclk/trunk/bcdclk"}, + {"DEMOS/BUDHBROT", VAR_PROGS .. "/demos/buddhabrot/trunk/buddhabrot"}, + {"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/trunk/eyes"}, + {"DEMOS/FIREWORK", VAR_PROGS .. "/demos/firework/trunk/firework"}, + {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/trunk/movback"}, + {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/trunk/plasma"}, + {"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"}, + {"DEMOS/TINYFRAC", VAR_PROGS .. "/demos/tinyfrac/trunk/tinyfrac"}, + {"DEMOS/TRANTEST", VAR_PROGS .. "/demos/trantest/trunk/trantest"}, + {"DEMOS/TUBE", VAR_PROGS .. "/demos/tube/trunk/tube"}, + {"DEMOS/UNVWATER", VAR_PROGS .. "/demos/unvwater/trunk/unvwater"}, + {"DEMOS/WEB", VAR_PROGS .. "/demos/web/trunk/web"}, + {"DEMOS/ZEROLINE", VAR_PROGS .. "/demos/zeroline/trunk/zeroline"}, + {"DEVELOP/ASCIIVJU", VAR_PROGS .. "/develop/asciivju/trunk/asciivju"}, + {"DEVELOP/BOARD", VAR_PROGS .. "/system/board/trunk/board"}, + {"DEVELOP/CEDIT", SRC_PROGS .. "/develop/cedit/CEDIT"}, + {"DEVELOP/COBJ", VAR_PROGS .. "/develop/cObj/trunk/cObj"}, + {"DEVELOP/ENTROPYV", VAR_PROGS .. "/develop/entropyview/entropyview"}, + {"DEVELOP/FASM", VAR_PROGS .. "/develop/fasm/1.73/fasm"}, + {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/trunk/h2d2b"}, + {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/trunk/heed"}, + {"DEVELOP/KEYASCII", VAR_PROGS .. "/develop/keyascii/trunk/keyascii"}, + {"DEVELOP/MTDBG", VAR_PROGS .. "/develop/mtdbg/mtdbg"}, + {"DEVELOP/SCANCODE", VAR_PROGS .. "/develop/scancode/trunk/scancode"}, + {"DEVELOP/EXAMPLES/CIRCLE", VAR_PROGS .. "/develop/examples/circle/trunk/circle"}, + {"DEVELOP/EXAMPLES/COLORREF", VAR_PROGS .. "/demos/colorref/trunk/colorref"}, + {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, + {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"}, + {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"}, + {"DEVELOP/EXAMPLES/USE_MB", VAR_PROGS .. "/demos/use_mb/use_mb"}, + {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"}, + {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"}, + {"GAMES/15", VAR_PROGS .. "/games/15/trunk/15"}, + {"GAMES/FREECELL", VAR_PROGS .. "/games/freecell/freecell"}, + {"GAMES/GOMOKU", VAR_PROGS .. "/games/gomoku/trunk/gomoku"}, + {"GAMES/LIGHTS", VAR_PROGS .. "/games/sq_game/trunk/SQ_GAME"}, + {"GAMES/LINES", VAR_PROGS .. "/games/lines/lines"}, + {"GAMES/MSQUARE", VAR_PROGS .. "/games/MSquare/trunk/MSquare"}, + {"GAMES/PIPES", VAR_PROGS .. "/games/pipes/pipes"}, + {"GAMES/PONG", VAR_PROGS .. "/games/pong/trunk/pong"}, + {"GAMES/PONG3", VAR_PROGS .. "/games/pong3/trunk/pong3"}, + {"GAMES/RSQUARE", VAR_PROGS .. "/games/rsquare/trunk/rsquare"}, + {"GAMES/SNAKE", VAR_PROGS .. "/games/snake/trunk/snake"}, + {"GAMES/SUDOKU", VAR_PROGS .. "/games/sudoku/trunk/sudoku"}, + {"GAMES/SW", VAR_PROGS .. "/games/sw/trunk/sw"}, + {"GAMES/TANKS", VAR_PROGS .. "/games/tanks/trunk/tanks"}, + {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/trunk/tetris"}, + {"LIB/ARCHIVER.OBJ", VAR_PROGS .. "/fs/kfar/trunk/kfar_arc/kfar_arc.obj"}, + {"LIB/BOX_LIB.OBJ", VAR_PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"}, + {"LIB/BUF2D.OBJ", VAR_PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"}, + {"LIB/CONSOLE.OBJ", VAR_PROGS .. "/develop/libraries/console_coff/console.obj"}, + {"LIB/CNV_PNG.OBJ", VAR_PROGS .. "/media/zsea/plugins/png/cnv_png.obj"}, + {"LIB/DLL.OBJ", VAR_PROGS .. "/develop/libraries/dll/dll.obj"}, + {"LIB/HTTP.OBJ", VAR_PROGS .. "/develop/libraries/http/http.obj"}, + {"LIB/LIBCRASH.OBJ", VAR_PROGS .. "/develop/libraries/libcrash/libcrash.obj"}, + {"LIB/LIBGFX.OBJ", VAR_PROGS .. "/develop/libraries/libs-dev/libgfx/libgfx.obj"}, + {"LIB/LIBIMG.OBJ", VAR_PROGS .. "/develop/libraries/libs-dev/libimg/libimg.obj"}, + {"LIB/LIBINI.OBJ", VAR_PROGS .. "/develop/libraries/libs-dev/libini/libini.obj"}, + {"LIB/LIBIO.OBJ", VAR_PROGS .. "/develop/libraries/libs-dev/libio/libio.obj"}, + {"LIB/MSGBOX.OBJ", VAR_PROGS .. "/develop/libraries/msgbox/msgbox.obj"}, + {"LIB/NETWORK.OBJ", VAR_PROGS .. "/develop/libraries/network/network.obj"}, + {"LIB/PROC_LIB.OBJ", VAR_PROGS .. "/develop/libraries/proc_lib/trunk/proc_lib.obj"}, + {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"}, + {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"}, + {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"}, + {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/trunk/animage"}, + {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"}, + {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"}, + {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"}, + {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"}, + {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/trunk/palitra"}, + {"MEDIA/PIANO", VAR_PROGS .. "/media/piano/piano"}, + {"MEDIA/STARTMUS", VAR_PROGS .. "/media/startmus/trunk/STARTMUS"}, + {"NETWORK/PING", VAR_PROGS .. "/network/ping/ping"}, + {"NETWORK/NETCFG", VAR_PROGS .. "/network/netcfg/netcfg"}, + {"NETWORK/NETSTAT", VAR_PROGS .. "/network/netstat/netstat"}, + {"NETWORK/NSINST", VAR_PROGS .. "/network/netsurf/nsinstall"}, + {"NETWORK/NSLOOKUP", VAR_PROGS .. "/network/nslookup/nslookup"}, + {"NETWORK/PASTA", VAR_PROGS .. "/network/pasta/pasta"}, + {"NETWORK/SYNERGYC", VAR_PROGS .. "/network/synergyc/synergyc"}, + {"NETWORK/SNTP", VAR_PROGS .. "/network/sntp/sntp"}, + {"NETWORK/TELNET", VAR_PROGS .. "/network/telnet/telnet"}, + {"NETWORK/@ZEROCONF", VAR_PROGS .. "/network/zeroconf/zeroconf"}, + {"NETWORK/FTPC", VAR_PROGS .. "/network/ftpc/ftpc"}, + {"NETWORK/FTPD", VAR_PROGS .. "/network/ftpd/ftpd"}, + {"NETWORK/TFTPC", VAR_PROGS .. "/network/tftpc/tftpc"}, + {"NETWORK/IRCC", VAR_PROGS .. "/network/ircc/ircc"}, + {"NETWORK/DOWNLOADER", VAR_PROGS .. "/network/downloader/downloader"}, + {"NETWORK/VNCC", VAR_PROGS .. "/network/vncc/vncc"}, + {"DRIVERS/VIDINTEL.SYS", VAR_DRVS .. "/video/vidintel.sys"}, + {"DRIVERS/3C59X.SYS", VAR_DRVS .. "/ethernet/3c59x.sys"}, + {"DRIVERS/AR81XX.SYS", VAR_DRVS .. "/ethernet/ar81xx.sys"}, + {"DRIVERS/DEC21X4X.SYS", VAR_DRVS .. "/ethernet/dec21x4x.sys"}, + {"DRIVERS/FORCEDETH.SYS", VAR_DRVS .. "/ethernet/forcedeth.sys"}, + {"DRIVERS/I8254X.SYS", VAR_DRVS .. "/ethernet/i8254x.sys"}, + {"DRIVERS/I8255X.SYS", VAR_DRVS .. "/ethernet/i8255x.sys"}, + {"DRIVERS/MTD80X.SYS", VAR_DRVS .. "/ethernet/mtd80x.sys"}, + {"DRIVERS/PCNET32.SYS", VAR_DRVS .. "/ethernet/pcnet32.sys"}, + {"DRIVERS/R6040.SYS", VAR_DRVS .. "/ethernet/R6040.sys"}, + {"DRIVERS/RHINE.SYS", VAR_DRVS .. "/ethernet/rhine.sys"}, + {"DRIVERS/RTL8029.SYS", VAR_DRVS .. "/ethernet/RTL8029.sys"}, + {"DRIVERS/RTL8139.SYS", VAR_DRVS .. "/ethernet/RTL8139.sys"}, + {"DRIVERS/RTL8169.SYS", VAR_DRVS .. "/ethernet/RTL8169.sys"}, + {"DRIVERS/SIS900.SYS", VAR_DRVS .. "/ethernet/sis900.sys"}, + {"DRIVERS/UHCI.SYS", VAR_DRVS .. "/usb/uhci.sys"}, + {"DRIVERS/OHCI.SYS", VAR_DRVS .. "/usb/ohci.sys"}, + {"DRIVERS/EHCI.SYS", VAR_DRVS .. "/usb/ehci.sys"}, + {"DRIVERS/USBHID.SYS", VAR_DRVS .. "/usb/usbhid/usbhid.sys"}, + {"DRIVERS/USBSTOR.SYS", VAR_DRVS .. "/usb/usbstor.sys"}, + {"DRIVERS/RDC.SYS", VAR_DRVS .. "/video/rdc.sys"}, + {"DRIVERS/COMMOUSE.SYS", VAR_DRVS .. "/mouse/commouse.sys"}, + {"DRIVERS/PS2MOUSE.SYS", VAR_DRVS .. "/mouse/ps2mouse4d/trunk/ps2mouse.sys"}, + {"DRIVERS/TMPDISK.SYS", VAR_DRVS .. "/disk/tmpdisk.sys"}, + {"DRIVERS/HDAUDIO.SYS", VAR_DRVS .. "/audio/intel_hda/hdaudio.sys"}, + {"DRIVERS/SB16.SYS", VAR_DRVS .. "/audio/sb16/sb16.sys"}, + {"DRIVERS/SOUND.SYS", VAR_DRVS .. "/audio/sound.sys"}, + {"DRIVERS/INFINITY.SYS", VAR_DRVS .. "/audio/infinity/infinity.sys"}, + {"DRIVERS/AC97.SYS", VAR_DRVS .. "/audio/ac97.sys"}, + {"DRIVERS/EMU10K1X.SYS", VAR_DRVS .. "/audio/emu10k1x.sys"}, + {"DRIVERS/FM801.SYS", VAR_DRVS .. "/audio/fm801.sys"}, + {"DRIVERS/VT823X.SYS", VAR_DRVS .. "/audio/vt823x.sys"}, + {"DRIVERS/SIS.SYS", VAR_DRVS .. "/audio/sis.sys"}, {"DRIVERS/SDHCI.SYS", "../drivers/sdhci/sdhci.sys"}, }) tup.append_table(extra_files, { - {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/9x2klbr.exe"}, - {"HD_Load/MeOSLoad/", PROGS .. "/hd_load/meosload/MeOSload.com"}, - {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/mtldr"}, - {"HD_Load/", PROGS .. "/hd_load/mtldr_install/mtldr_install.exe"}, - {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/BOOT_F32.BIN"}, - {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/MTLD_F32"}, - {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/inst.exe"}, - {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/setmbr.exe"}, - {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/MeOSload.com"}, - {"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/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/demos/life3", PROGS .. "/games/life3/trunk/life3"}, - {"kolibrios/demos/qjulia", PROGS .. "/demos/qjulia/trunk/qjulia"}, - {"kolibrios/develop/utils/koldbg", PROGS .. "/develop/koldbg/koldbg"}, - {"kolibrios/games/Almaz", PROGS .. "/games/almaz/almaz"}, - {"kolibrios/games/arcanii", PROGS .. "/games/arcanii/trunk/arcanii"}, - {"kolibrios/games/bomber/bomber", PROGS .. "/games/bomber/bomber"}, - {"kolibrios/games/bomber/bomberdata.bin", PROGS .. "/games/bomber/sounds/bomberdata.bin"}, - {"kolibrios/games/codemaster/binary_master", PROGS .. "/games/codemaster/binary_master"}, - {"kolibrios/games/codemaster/hang_programmer", PROGS .. "/games/codemaster/hang_programmer"}, - {"kolibrios/games/codemaster/kolibri_puzzle", PROGS .. "/games/codemaster/kolibri_puzzle"}, - {"kolibrios/games/megamaze", PROGS .. "/games/megamaze/trunk/megamaze"}, - {"kolibrios/games/invaders", PROGS .. "/games/invaders/invaders"}, - {"kolibrios/games/phenix", PROGS .. "/games/phenix/trunk/phenix"}, - {"kolibrios/games/soko/soko", PROGS .. "/games/soko/trunk/SOKO"}, - {"kolibrios/media/img_transform", PROGS .. "/media/img_transform/img_transform"}, - {"kolibrios/media/zsea/zsea", PROGS .. "/media/zsea/zSea"}, - {"kolibrios/media/zsea/plugins/cnv_bmp.obj", PROGS .. "/media/zsea/plugins/bmp/cnv_bmp.obj"}, - {"kolibrios/media/zsea/plugins/cnv_gif.obj", PROGS .. "/media/zsea/plugins/gif/cnv_gif.obj"}, - {"kolibrios/media/zsea/plugins/cnv_jpeg.obj", PROGS .. "/media/zsea/plugins/jpeg/cnv_jpeg.obj"}, - {"kolibrios/media/zsea/plugins/convert.obj", PROGS .. "/media/zsea/plugins/convert/convert.obj"}, - {"kolibrios/media/zsea/plugins/rotate.obj", PROGS .. "/media/zsea/plugins/rotate/rotate.obj"}, - {"kolibrios/media/zsea/plugins/scaling.obj", PROGS .. "/media/zsea/plugins/scaling/scaling.obj"}, - {"kolibrios/utils/AMDtemp", PROGS .. "/system/amd_temp_view/AMDtemp"}, - {"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"}, - {"kolibrios/utils/kfm/kfm", PROGS .. "/fs/kfm/trunk/kfm"}, - {"kolibrios/utils/tedit/t_edit", PROGS .. "/other/t_edit/t_edit"}, + {"HD_Load/9x2klbr/", VAR_PROGS .. "/hd_load/9x2klbr/9x2klbr.exe"}, + {"HD_Load/MeOSLoad/", VAR_PROGS .. "/hd_load/meosload/MeOSload.com"}, + {"HD_Load/mtldr/", VAR_PROGS .. "/hd_load/mtldr/mtldr"}, + {"HD_Load/", VAR_PROGS .. "/hd_load/mtldr_install/mtldr_install.exe"}, + {"HD_Load/USB_Boot/", VAR_PROGS .. "/hd_load/usb_boot/BOOT_F32.BIN"}, + {"HD_Load/USB_Boot/", VAR_PROGS .. "/hd_load/usb_boot/MTLD_F32"}, + {"HD_Load/USB_Boot/", VAR_PROGS .. "/hd_load/usb_boot/inst.exe"}, + {"HD_Load/USB_Boot/", VAR_PROGS .. "/hd_load/usb_boot/setmbr.exe"}, + {"HD_Load/USB_boot_old/", VAR_PROGS .. "/hd_load/usb_boot_old/MeOSload.com"}, + {"HD_Load/USB_boot_old/", VAR_PROGS .. "/hd_load/usb_boot_old/enable.exe"}, + {"kolibrios/3D/3dsheart", VAR_PROGS .. "/demos/3dsheart/trunk/3dsheart"}, + {"kolibrios/3D/flatwav", VAR_PROGS .. "/demos/flatwav/trunk/flatwav"}, + {"kolibrios/3D/mos3de", VAR_PROGS .. "/demos/mos3de/mos3de"}, + {"kolibrios/3D/info3ds/INFO3DS", VAR_PROGS .. "/develop/info3ds/info3ds"}, + {"kolibrios/3D/textures1", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/textures1"}, + {"kolibrios/3D/info3ds/INFO3DS_U", VAR_PROGS .. "/develop/info3ds/info3ds_u"}, + {"kolibrios/3D/voxel_editor/VOXEL_EDITOR", VAR_PROGS .. "/media/voxel_editor/trunk/voxel_editor"}, + {"kolibrios/3D/voxel_utilites/VOX_CREATOR" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_creator"}, + {"kolibrios/3D/voxel_utilites/VOX_MOVER" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_mover"}, + {"kolibrios/3D/voxel_utilites/VOX_TGL" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_tgl"}, + {"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/trunk/life3"}, + {"kolibrios/demos/qjulia", VAR_PROGS .. "/demos/qjulia/trunk/qjulia"}, + {"kolibrios/develop/utils/koldbg", VAR_PROGS .. "/develop/koldbg/koldbg"}, + {"kolibrios/games/Almaz", VAR_PROGS .. "/games/almaz/almaz"}, + {"kolibrios/games/arcanii", VAR_PROGS .. "/games/arcanii/trunk/arcanii"}, + {"kolibrios/games/bomber/bomber", VAR_PROGS .. "/games/bomber/bomber"}, + {"kolibrios/games/bomber/bomberdata.bin", VAR_PROGS .. "/games/bomber/sounds/bomberdata.bin"}, + {"kolibrios/games/codemaster/binary_master", VAR_PROGS .. "/games/codemaster/binary_master"}, + {"kolibrios/games/codemaster/hang_programmer", VAR_PROGS .. "/games/codemaster/hang_programmer"}, + {"kolibrios/games/codemaster/kolibri_puzzle", VAR_PROGS .. "/games/codemaster/kolibri_puzzle"}, + {"kolibrios/games/megamaze", VAR_PROGS .. "/games/megamaze/trunk/megamaze"}, + {"kolibrios/games/invaders", VAR_PROGS .. "/games/invaders/invaders"}, + {"kolibrios/games/phenix", VAR_PROGS .. "/games/phenix/trunk/phenix"}, + {"kolibrios/games/soko/soko", VAR_PROGS .. "/games/soko/trunk/SOKO"}, + {"kolibrios/media/img_transform", VAR_PROGS .. "/media/img_transform/img_transform"}, + {"kolibrios/media/zsea/zsea", VAR_PROGS .. "/media/zsea/zSea"}, + {"kolibrios/media/zsea/plugins/cnv_bmp.obj", VAR_PROGS .. "/media/zsea/plugins/bmp/cnv_bmp.obj"}, + {"kolibrios/media/zsea/plugins/cnv_gif.obj", VAR_PROGS .. "/media/zsea/plugins/gif/cnv_gif.obj"}, + {"kolibrios/media/zsea/plugins/cnv_jpeg.obj", VAR_PROGS .. "/media/zsea/plugins/jpeg/cnv_jpeg.obj"}, + {"kolibrios/media/zsea/plugins/convert.obj", VAR_PROGS .. "/media/zsea/plugins/convert/convert.obj"}, + {"kolibrios/media/zsea/plugins/rotate.obj", VAR_PROGS .. "/media/zsea/plugins/rotate/rotate.obj"}, + {"kolibrios/media/zsea/plugins/scaling.obj", VAR_PROGS .. "/media/zsea/plugins/scaling/scaling.obj"}, + {"kolibrios/utils/AMDtemp", VAR_PROGS .. "/system/amd_temp_view/AMDtemp"}, + {"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"}, }) -- For russian build, add russian-only programs. if build_type == "rus" then tup.append_table(img_files, { - {"PERIOD", PROGS .. "/other/period/trunk/period"}, - {"GAMES/KLAVISHA", PROGS .. "/games/klavisha/trunk/klavisha"}, - {"DEVELOP/EXAMPLES/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, + {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"}, + {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/trunk/klavisha"}, + {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, }) else tup.append_table(img_files, { - {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, + {"DEVELOP/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, }) end if build_type == "rus" then tup.append_table(extra_files, { - {"kolibrios/games/Dungeons/Dungeons", PROGS .. "/games/Dungeons/Dungeons"}, + {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"}, }) end end -- tup.getconfig('NO_FASM') ~= 'full' @@ -622,14 +632,14 @@ end -- tup.getconfig('NO_FASM') ~= 'full' -- Programs that require NASM to compile. if tup.getconfig('NO_NASM') ~= 'full' then tup.append_table(img_files, { - {"ACLOCK", PROGS .. "/demos/aclock/trunk/aclock"}, - {"LOD", PROGS .. "/fs/lod/lod"}, - {"TIMER", PROGS .. "/other/Timer/timer"}, - {"TINFO", PROGS .. "/system/tinfo/tinfo"}, - {"DEVELOP/MSTATE", PROGS .. "/develop/mstate/mstate"}, - {"DEVELOP/GENFILES", PROGS .. "/testing/genfiles/GenFiles"}, - {"GAMES/C4", PROGS .. "/games/c4/trunk/c4"}, - {"MEDIA/FILLSCR", PROGS .. "/media/FillScr/fillscr"}, + {"ACLOCK", VAR_PROGS .. "/demos/aclock/trunk/aclock"}, + {"LOD", VAR_PROGS .. "/fs/lod/lod"}, + {"TIMER", VAR_PROGS .. "/other/Timer/timer"}, + {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"}, + {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"}, + {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"}, + {"GAMES/C4", VAR_PROGS .. "/games/c4/trunk/c4"}, + {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"}, }) tup.append_table(extra_files, { }) @@ -638,11 +648,11 @@ end -- tup.getconfig('NO_NASM') ~= 'full' -- Programs that require JWASM to compile. if tup.getconfig('NO_JWASM') ~= 'full' then tup.append_table(img_files, { - {"LIB/INPUTBOX.OBJ", PROGS .. "/develop/libraries/InputBox/INPUTBOX.OBJ"}, + {"LIB/INPUTBOX.OBJ", VAR_PROGS .. "/develop/libraries/InputBox/INPUTBOX.OBJ"}, }) if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { - {"RUN", PROGS .. "/system/RunOD/1/RUN"}, + {"RUN", VAR_PROGS .. "/system/RunOD/1/RUN"}, }) end end -- tup.getconfig('NO_JWASM') ~= 'full' @@ -650,141 +660,141 @@ end -- tup.getconfig('NO_JWASM') ~= 'full' -- Programs that require C-- to compile. if tup.getconfig('NO_CMM') ~= 'full' then tup.append_table(img_files, { - {"@RESHARE", PROGS .. "/cmm/misc/reshare.com"}, - {"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"}, - {"EASYSHOT", PROGS .. "/cmm/misc/easyshot.com"}, - {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, - {"BARSCFG", PROGS .. "/cmm/barscfg/barscfg.com"}, - {"SYSPANEL", PROGS .. "/cmm/misc/software_widget.com"}, - {"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"}, - {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"}, - {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"}, - {"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"}, - {"DEVELOP/PIPET", PROGS .. "/cmm/misc/pipet.com"}, - {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"}, - {"File Managers/KFM2", PROGS .. "/cmm/misc/kfm2.com"}, - {"KF_VIEW", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, - {"DEVELOP/DIFF", PROGS .. "/cmm/diff/diff.com"}, - {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"}, - {"GAMES/MBLOCKS", PROGS .. "/cmm/misc/mblocks.com"}, - {"GAMES/FLOOD-IT", PROGS .. "/games/flood-it/trunk/flood-it.com"}, - {"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"}, - {"GAMES/NUMBERS", PROGS .. "/games/FindNumbers/trunk/FindNumbers"}, - {"MEDIA/PIXIE", PROGS .. "/cmm/pixie2/pixie.com"}, - {"MEDIA/ICONEDIT", PROGS .. "/cmm/iconedit/iconedit.com"}, - {"NETWORK/DL", PROGS .. "/cmm/downloader/dl.com"}, - {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"}, + {"@RESHARE", VAR_PROGS .. "/cmm/misc/reshare.com"}, + {"APP_PLUS", VAR_PROGS .. "/cmm/app_plus/app_plus.com"}, + {"EASYSHOT", VAR_PROGS .. "/cmm/misc/easyshot.com"}, + {"MOUSECFG", VAR_PROGS .. "/cmm/mousecfg/mousecfg.com"}, + {"BARSCFG", VAR_PROGS .. "/cmm/barscfg/barscfg.com"}, + {"SYSPANEL", VAR_PROGS .. "/cmm/misc/software_widget.com"}, + {"SYSMON", VAR_PROGS .. "/cmm/sysmon/sysmon.com"}, + {"TMPDISK", VAR_PROGS .. "/cmm/tmpdisk/tmpdisk.com"}, + {"DEVELOP/CLIPVIEW", VAR_PROGS .. "/cmm/clipview/clipview.com"}, + {"DEVELOP/MENU", VAR_PROGS .. "/cmm/menu/menu.com"}, + {"DEVELOP/PIPET", VAR_PROGS .. "/cmm/misc/pipet.com"}, + {"File Managers/EOLITE", VAR_PROGS .. "/cmm/eolite/Eolite.com"}, + {"File Managers/KFM2", VAR_PROGS .. "/cmm/misc/kfm2.com"}, + {"KF_VIEW", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, + {"DEVELOP/DIFF", VAR_PROGS .. "/cmm/diff/diff.com"}, + {"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/trunk/clicks.com"}, + {"GAMES/MBLOCKS", VAR_PROGS .. "/cmm/misc/mblocks.com"}, + {"GAMES/FLOOD-IT", VAR_PROGS .. "/games/flood-it/trunk/flood-it.com"}, + {"GAMES/MINE", VAR_PROGS .. "/games/mine/trunk/mine"}, + {"GAMES/NUMBERS", VAR_PROGS .. "/games/FindNumbers/trunk/FindNumbers"}, + {"MEDIA/PIXIE", VAR_PROGS .. "/cmm/pixie2/pixie.com"}, + {"MEDIA/ICONEDIT", VAR_PROGS .. "/cmm/iconedit/iconedit.com"}, + {"NETWORK/DL", VAR_PROGS .. "/cmm/downloader/dl.com"}, + {"NETWORK/WEBVIEW", VAR_PROGS .. "/cmm/browser/WebView.com"}, }) tup.append_table(extra_files, { - {"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"}, - {"kolibrios/drivers/acpi/install.kex", PROGS .. "/cmm/misc/acpi_install.com"}, - {"kolibrios/games/pig/pigex", PROGS .. "/cmm/examples/pigex.com"}, - {"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"}, - {"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/misc/install.com"}, - {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"}, - {"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"}, - {"kolibrios/utils/notes", PROGS .. "/cmm/notes/notes.com"}, - {"kolibrios/utils/osupdate", PROGS .. "/cmm/misc/osupdate.com"}, - {"kolibrios/utils/quark", PROGS .. "/cmm/quark/quark.com"}, + {"kolibrios/drivers/drvinst.kex", VAR_PROGS .. "/cmm/drvinst/drvinst.com"}, + {"kolibrios/drivers/acpi/install.kex", VAR_PROGS .. "/cmm/misc/acpi_install.com"}, + {"kolibrios/games/pig/pigex", VAR_PROGS .. "/cmm/examples/pigex.com"}, + {"kolibrios/games/the_bus/the_bus", VAR_PROGS .. "/cmm/the_bus/the_bus.com"}, + {"kolibrios/KolibriNext/install.kex", VAR_PROGS .. "/cmm/misc/install.com"}, + {"kolibrios/utils/appearance", VAR_PROGS .. "/cmm/appearance/appearance.com"}, + {"kolibrios/utils/dicty.kex", VAR_PROGS .. "/cmm/dicty/dicty.com"}, + {"kolibrios/utils/notes", VAR_PROGS .. "/cmm/notes/notes.com"}, + {"kolibrios/utils/osupdate", VAR_PROGS .. "/cmm/misc/osupdate.com"}, + {"kolibrios/utils/quark", VAR_PROGS .. "/cmm/quark/quark.com"}, }) end -- tup.getconfig('NO_CMM') ~= 'full' -- Programs that require MSVC to compile. if tup.getconfig('NO_MSVC') ~= 'full' then tup.append_table(img_files, { - {"GRAPH", PROGS .. "/other/graph/graph"}, - {"TABLE", PROGS .. "/other/table/table"}, - {"MEDIA/AC97SND", PROGS .. "/media/ac97snd/ac97snd.bin"}, - {"GAMES/KOSILKA", PROGS .. "/games/kosilka/kosilka"}, - {"GAMES/RFORCES", PROGS .. "/games/rforces/trunk/rforces"}, - {"GAMES/XONIX", PROGS .. "/games/xonix/trunk/xonix"}, + {"GRAPH", VAR_PROGS .. "/other/graph/graph"}, + {"TABLE", VAR_PROGS .. "/other/table/table"}, + {"MEDIA/AC97SND", VAR_PROGS .. "/media/ac97snd/ac97snd.bin"}, + {"GAMES/KOSILKA", VAR_PROGS .. "/games/kosilka/kosilka"}, + {"GAMES/RFORCES", VAR_PROGS .. "/games/rforces/trunk/rforces"}, + {"GAMES/XONIX", VAR_PROGS .. "/games/xonix/trunk/xonix"}, }) tup.append_table(extra_files, { - {"kolibrios/games/fara/fara", PROGS .. "/games/fara/trunk/fara"}, - {"kolibrios/games/LaserTank/LaserTank", PROGS .. "/games/LaserTank/trunk/LaserTank"}, + {"kolibrios/games/fara/fara", VAR_PROGS .. "/games/fara/trunk/fara"}, + {"kolibrios/games/LaserTank/LaserTank", VAR_PROGS .. "/games/LaserTank/trunk/LaserTank"}, }) end -- tup.getconfig('NO_MSVC') ~= 'full' -- Programs that require TCC to compile. if tup.getconfig('NO_TCC') ~= 'full' then tup.append_table(img_files, { - {"NETWORK/WHOIS", PROGS .. "/network/whois/whois"}, - {"SHELL", PROGS .. "/system/shell/shell"}, + {"NETWORK/WHOIS", VAR_PROGS .. "/network/whois/whois"}, + {"SHELL", VAR_PROGS .. "/system/shell/shell"}, }) tup.append_table(extra_files, { - {"kolibrios/utils/thashview", PROGS .. "/other/TinyHashView/thashview"}, - {"kolibrios/demos/kmatrix", PROGS .. "/demos/kmatrix/trunk/kmatrix"}, - {"kolibrios/utils/graph", PROGS .. "/other/graph/branches/tcc_current/graph"}, - {"kolibrios/develop/TinyBasic/TinyBasic", PROGS .. "/develop/tinybasic-1.0.4/tinybasic"}, - {"kolibrios/develop/TinyBasic/bas/", PROGS .. "/develop/tinybasic-1.0.4/bas/*"}, - {"kolibrios/develop/TinyBasic/TinyBasic.man", PROGS .. "/develop/tinybasic-1.0.4/doc/tinybasic.man"}, --- {"kolibrios/utils/teatool", PROGS .. "/other/TEAtool/teatool"}, - {"kolibrios/utils/passwordgen", PROGS .. "/other/PasswordGen/passwordgen"}, - {"kolibrios/utils/kruler", PROGS .. "/other/kruler/kruler"}, - {"kolibrios/media/qr_tool", PROGS .. "/media/qr_tool/qr_tool"}, - {"kolibrios/utils/weather", PROGS .. "/other/Weather/weather"}, - {"kolibrios/settings/weather.json", PROGS .. "/other/Weather/weather.json"}, - {"kolibrios/utils/man2html", PROGS .."/other/man2html/man2html"}, + {"kolibrios/utils/thashview", VAR_PROGS .. "/other/TinyHashView/thashview"}, + {"kolibrios/demos/kmatrix", VAR_PROGS .. "/demos/kmatrix/trunk/kmatrix"}, + {"kolibrios/utils/graph", VAR_PROGS .. "/other/graph/branches/tcc_current/graph"}, + {"kolibrios/develop/TinyBasic/TinyBasic", VAR_PROGS .. "/develop/tinybasic-1.0.4/tinybasic"}, + {"kolibrios/develop/TinyBasic/bas/", SRC_PROGS .. "/develop/tinybasic-1.0.4/bas/*"}, + {"kolibrios/develop/TinyBasic/TinyBasic.man", SRC_PROGS .. "/develop/tinybasic-1.0.4/doc/tinybasic.man"}, +-- {"kolibrios/utils/teatool", VAR_PROGS .. "/other/TEAtool/teatool"}, + {"kolibrios/utils/passwordgen", VAR_PROGS .. "/other/PasswordGen/passwordgen"}, + {"kolibrios/utils/kruler", VAR_PROGS .. "/other/kruler/kruler"}, + {"kolibrios/media/qr_tool", SRC_PROGS .. "/media/qr_tool/qr_tool"}, + {"kolibrios/utils/weather", VAR_PROGS .. "/other/Weather/weather"}, + {"kolibrios/settings/weather.json", SRC_PROGS .. "/other/Weather/weather.json"}, + {"kolibrios/utils/man2html", VAR_PROGS .."/other/man2html/man2html"}, }) end -- tup.getconfig('NO_TCC') ~= 'full' -- Programs that require GCC to compile. if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { - {"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"}, - {"LIB/BASE64.OBJ", PROGS .. "/develop/libraries/base64/base64.obj"}, - {"LIB/LIBC.OBJ", PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"}, - {"LIB/ICONV.OBJ", PROGS .. "/develop/libraries/iconv/iconv.obj"}, - -- {"LIB/MTAR.OBJ", PROGS .. "/develop/libraries/microtar/mtar.obj"}, + {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/trunk/reversi"}, + {"LIB/BASE64.OBJ", VAR_PROGS .. "/develop/libraries/base64/base64.obj"}, + {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"}, + {"LIB/ICONV.OBJ", VAR_PROGS .. "/develop/libraries/iconv/iconv.obj"}, + -- {"LIB/MTAR.OBJ", VAR_PROGS .. "/develop/libraries/microtar/mtar.obj"}, }) tup.append_table(extra_files, { --- {"kolibrios/3D/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, - {"kolibrios/3D/gears", PROGS .. "/demos/gears/gears"}, - {"kolibrios/emul/e80/e80", PROGS .. "/emulator/e80/trunk/e80"}, - {"kolibrios/emul/uarm/", "../contrib/other/uarm/uARM"}, - {"kolibrios/games/2048", PROGS .. "/games/2048/2048"}, - {"kolibrios/games/checkers", PROGS .. "/games/checkers/trunk/checkers"}, - {"kolibrios/games/donkey", PROGS .. "/games/donkey/donkey"}, - {"kolibrios/games/heliothryx", PROGS .. "/games/heliothryx/heliothryx"}, - {"kolibrios/games/marblematch3", PROGS .. "/games/marblematch3/marblematch3"}, - {"kolibrios/games/nsider", PROGS .. "/games/nsider/nsider"}, - {"kolibrios/games/fridge/", PROGS .. "/games/fridge/fridge"}, - {"kolibrios/develop/lua/lua", "../contrib/other/lua-5.2.0/lua"}, +-- {"kolibrios/3D/cubeline", VAR_PROGS .. "/demos/cubeline/trunk/cubeline"}, + {"kolibrios/3D/gears", VAR_PROGS .. "/demos/gears/gears"}, + {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"}, + {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"}, + {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"}, + {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/trunk/checkers"}, + {"kolibrios/games/donkey", VAR_PROGS .. "/games/donkey/donkey"}, + {"kolibrios/games/heliothryx", VAR_PROGS .. "/games/heliothryx/heliothryx"}, + {"kolibrios/games/marblematch3", VAR_PROGS .. "/games/marblematch3/marblematch3"}, + {"kolibrios/games/nsider", VAR_PROGS .. "/games/nsider/nsider"}, + {"kolibrios/games/fridge/", VAR_PROGS .. "/games/fridge/fridge"}, + {"kolibrios/develop/lua/lua", VAR_CONTRIB .. "/other/lua-5.2.0/lua"}, {"kolibrios/develop/lua/calc.lua", "../contrib/other/lua-5.2.0/calc.lua"}, {"kolibrios/develop/lua/console.lua", "../contrib/other/lua-5.2.0/console.lua"}, - {"kolibrios/lib/libc.dll", "../contrib/sdk/bin/libc.dll", group = "../contrib/sdk/lib/"}, - {"kolibrios/lib/dr_flac.obj", "../contrib/media/dr_flac/dr_flac.obj"}, - {"kolibrios/lib/minimp3.obj", "../contrib/media/minimp3/minimp3.obj"}, - {"kolibrios/lib/sqlite3.dll", "../contrib/sdk/bin/sqlite3.dll", group = "../contrib/sdk/lib/"}, - {"kolibrios/lib/stb_vorbis.obj", "../contrib/media/stb_vorbis/stb_vorbis.obj"}, - {"kolibrios/utils/minizip/minizip", PROGS .. "/fs/minizip/minizip"}, - {"kolibrios/utils/minizip/miniunz", PROGS .. "/fs/minizip/miniunz"}, - {"kolibrios/develop/c--/c--", PROGS .. "/develop/cmm/cmm"}, - {"kolibrios/develop/tcc/tcc", PROGS .. "/develop/ktcc/trunk/source/tcc"}, - {"kolibrios/develop/sqlite3/sqlite3", "../contrib/sdk/sources/sqlite3/shell/sqlite3"}, - {"kolibrios/develop/utils/objconv", PROGS .. "/develop/objconv/objconv"}, - {"kolibrios/drivers/sensors/k10temp.sys", "../drivers/sensors/k10temp/k10temp.sys"}, - {"kolibrios/drivers/acpi/acpi.sys", "../drivers/devman/acpi.sys"}, - {"kolibrios/drivers/acpi/acpi", "../drivers/devman/acpi"}, + {"kolibrios/lib/libc.dll", VAR_PROGS .. "/../contrib/sdk/bin/libc.dll", group = "../contrib/sdk/lib/"}, + {"kolibrios/lib/dr_flac.obj", VAR_CONTRIB .. "/media/dr_flac/dr_flac.obj"}, + {"kolibrios/lib/minimp3.obj", VAR_CONTRIB .. "/media/minimp3/minimp3.obj"}, + {"kolibrios/lib/sqlite3.dll", VAR_CONTRIB .. "/sdk/bin/sqlite3.dll", group = "../contrib/sdk/lib/"}, + {"kolibrios/lib/stb_vorbis.obj", VAR_CONTRIB .. "/media/stb_vorbis/stb_vorbis.obj"}, + {"kolibrios/utils/minizip/minizip", VAR_PROGS .. "/fs/minizip/minizip"}, + {"kolibrios/utils/minizip/miniunz", VAR_PROGS .. "/fs/minizip/miniunz"}, + {"kolibrios/develop/c--/c--", VAR_PROGS .. "/develop/cmm/cmm"}, + {"kolibrios/develop/tcc/tcc", VAR_PROGS .. "/develop/ktcc/trunk/source/tcc"}, + {"kolibrios/develop/sqlite3/sqlite3", VAR_CONTRIB .. "/sdk/sources/sqlite3/shell/sqlite3"}, + {"kolibrios/develop/utils/objconv", VAR_PROGS .. "/develop/objconv/objconv"}, + {"kolibrios/drivers/sensors/k10temp.sys", VAR_DRVS .. "/sensors/k10temp/k10temp.sys"}, + {"kolibrios/drivers/acpi/acpi.sys", VAR_DRVS .. "/devman/acpi.sys"}, + {"kolibrios/drivers/acpi/acpi", VAR_DRVS .. "/devman/acpi"}, {"kolibrios/drivers/geode/geode.sys", "common/drivers/geode/geode.sys"}, -- there is also an autobuid version that is not working - {"kolibrios/drivers/geode/geode", "../drivers/audio/a5536/geode"}, + {"kolibrios/drivers/geode/geode", VAR_DRVS .. "/audio/a5536/geode"}, }) if tup.getconfig('NO_NASM') ~= 'full' then tup.append_table(extra_files, { - {"kolibrios/games/tyrian/", "../contrib/games/opentyrian/opentyrian"}, + {"kolibrios/games/tyrian/", VAR_CONTRIB .. "/games/opentyrian/opentyrian"}, {"kolibrios/games/tyrian/data/", "common/games/tyrian/data/*"}, {"kolibrios/games/quake/", "common/games/quake/*"}, -- not really gcc, but no sense without sdlquake - {"kolibrios/games/quake/", "../contrib/other/sdlquake-1.0.9/sdlquake"}, - {"kolibrios/games/wolf3d/", "../contrib/games/wolf3d/wolf3d"}, + {"kolibrios/games/quake/", VAR_CONTRIB .. "/other/sdlquake-1.0.9/sdlquake"}, + {"kolibrios/games/wolf3d/", VAR_CONTRIB .. "/games/wolf3d/wolf3d"}, {"kolibrios/games/wolf3d/", "common/games/wolf3d/*"}, - {"kolibrios/emul/dgen/dgen", PROGS .. "/emulator/dgen-sdl-1.33/dgen"}, - {"kolibrios/emul/dgen/dgen.html", PROGS .. "/emulator/dgen-sdl-1.33/dgen.html"}, - {"kolibrios/emul/dgen/dgenrc.html", PROGS .. "/emulator/dgen-sdl-1.33/dgenrc.html"}, + {"kolibrios/emul/dgen/dgen", VAR_PROGS .. "/emulator/dgen-sdl-1.33/dgen"}, + {"kolibrios/emul/dgen/dgen.html", SRC_PROGS .. "/emulator/dgen-sdl-1.33/dgen.html"}, + {"kolibrios/emul/dgen/dgenrc.html", SRC_PROGS .. "/emulator/dgen-sdl-1.33/dgenrc.html"}, }) end -- For russian build, add russian-only programs. if build_type == "rus" then tup.append_table(extra_files, { - {"kolibrios/games/21days", PROGS .. "/games/21days/21days"}, + {"kolibrios/games/21days", VAR_PROGS .. "/games/21days/21days"}, }) end end -- tup.getconfig('NO_GCC') ~= 'full' @@ -814,7 +824,7 @@ end -- append skins to extra_files for i,v in ipairs(skinlist) do - table.insert(extra_files, {"kolibrios/res/skins/", "../skins/" .. v}) + table.insert(extra_files, {"kolibrios/res/skins/", VAR_SKINS .. "/" .. v}) end -- prepare distr_extra_files and iso_extra_files: expand and append common part @@ -845,53 +855,56 @@ for i,v in ipairs(img_files) do end -- create empty 1.44M file -make_img_command = '^ MKIMG kolibri.img^ ' -- for tup: don't write full command to logs -make_img_command = make_img_command .. "dd if=/dev/zero of=kolibri.img count=2880 bs=512 2>&1" +make_img_command1 = '^ MKIMG kolibri.img^ ' -- for tup: don't write full command to logs +make_img_command1 += "dd status=none if=/dev/zero of=%o count=2880 bs=512" -- format it as a standard 1.44M floppy -make_img_command = make_img_command .. " && mformat -f 1440 -i kolibri.img ::" +make_img_command1 += " && mformat -f 1440 -i %o ::" -- copy bootloader if tup.getconfig("NO_FASM") ~= "full" then -bootloader = "../kernel/trunk/bootloader/boot_fat12.bin" -make_img_command = make_img_command .. " && dd if=" .. bootloader .. " of=kolibri.img count=1 bs=512 conv=notrunc 2>&1" +bootloader = VAR_KERNEL .. "/bootloader/boot_fat12.bin" +make_img_command1 += " && dd status=none if=" .. bootloader .. " of=%o count=1 bs=512 conv=notrunc" table.insert(input_deps, bootloader) end -- make folders table.sort(img_dirs) for i,v in ipairs(img_dirs) do if v ~= img_dirs[i-1] then - make_img_command = make_img_command .. ' && mmd -i kolibri.img "::' .. v .. '"' + make_img_command1 += ' && mmd -i %o "::' .. v .. '"' end end -- copy files -output_deps = {"kolibri.img"} for i,v in ipairs(img_files) do local_file = v[2] - if v[1] == "KERNEL.MNT" and tup.getconfig("INSERT_REVISION_ID") ~= "" + if v[1] == "KERNEL.MNT" then -- for kernel.mnt, insert autobuild revision identifier -- from .revision to .kernel.mnt -- note that .revision and .kernel.mnt must begin with . -- to prevent tup from tracking them - if build_type == "rus" - then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-revision)]"|iconv -f utf8 -t cp866)' - else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-revision)]")' + cmd = "cp %f %o" + if tup.getconfig("INSERT_REVISION_ID") ~= "" + then + if build_type == "rus" + then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-revision)]"|iconv -f utf8 -t cp866)' + else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-revision)]")' + end + str = string.gsub(str, "%$", "\\$") -- escape $ as \$ + str = string.gsub(str, "%%", "%%%%") -- escape % as %% + cmd += " && str=" .. str + cmd += ' && echo -n $str | dd status=none of=%o bs=1 seek=`expr 274 - length "$str"` conv=notrunc' end - str = string.gsub(str, "%$", "\\$") -- escape $ as \$ - str = string.gsub(str, "%%", "%%%%") -- escape % as %% - make_img_command = make_img_command .. " && cp " .. local_file .. " .kernel.mnt" - make_img_command = make_img_command .. " && str=" .. str - make_img_command = make_img_command .. ' && echo -n $str | dd of=.kernel.mnt bs=1 seek=`expr 274 - length "$str"` conv=notrunc 2>/dev/null' - local_file = ".kernel.mnt" - table.insert(output_deps, local_file) + local_file = VAR_KERNEL .. "/.kernel.mnt" + tup.definerule{inputs = {v[2]}, command = cmd, outputs = {local_file}} end - make_img_command = make_img_command .. ' && mcopy -moi kolibri.img "' .. local_file .. '" "::' .. v[1] .. '"' + table.insert(input_deps, local_file) + make_img_command1 += ' && mcopy -moi %o "' .. local_file .. '" "::' .. v[1] .. '"' end -- generate tup rule for kolibri.img -tup.definerule{inputs = input_deps, command = make_img_command, outputs = output_deps} +tup.definerule{inputs = input_deps, command = make_img_command1, outputs = {"kolibri.img"}} -- generate command and dependencies for mkisofs -input_deps = {"kolibri.img"} +input_deps = {VAR_DATA .. "/kolibri.img"} iso_files_list = "" for i,v in ipairs(iso_extra_files) do iso_files_list = iso_files_list .. ' "' .. v[1] .. '=' .. v[2] .. '"' @@ -907,14 +920,14 @@ tup.definerule{inputs = input_deps, command = '^ MKISOFS kolibri.iso^ ' .. -- for tup: don't write full command to logs 'mkisofs -U -J -pad -b kolibri.img -c boot.catalog -hide-joliet boot.catalog -graft-points ' .. '-A "KolibriOS AutoBuilder" -p "CleverMouse" -publisher "KolibriOS Team" -V "' .. volume_id .. '" -sysid "KOLIBRI" ' .. - '-iso-level 3 -o kolibri.iso kolibri.img' .. iso_files_list .. ' 2>&1', + '-iso-level 3 -o %o ' .. VAR_DATA .. '/kolibri.img' .. iso_files_list .. ' 2>&1', outputs = {"kolibri.iso"}} -- generate command and dependencies for distribution kit cp = 'cp "%f" "%o"' -tup.definerule{inputs = {"kolibri.img"}, command = cp, outputs = {"distribution_kit/kolibri.img"}} +tup.definerule{inputs = {VAR_DATA .. "/kolibri.img"}, command = cp, outputs = {"distribution_kit/kolibri.img"}} for i,v in ipairs(distr_extra_files) do - cmd = cp:gsub("%%f", v[2]) -- input can be a group, we can't rely on tup's expansion of %f in this case + cmd = cp:gsub("%%f", string.gsub(v[2], "%%", "%%%%")) -- input can be a group, we can't rely on tup's expansion of %f in this case if string.sub(v[1], -1) == "/" then tup.definerule{inputs = {v.group or v[2]}, command = cmd, outputs = {"distribution_kit/" .. v[1] .. tup.file(v[2])}} else tup.definerule{inputs = {v.group or v[2]}, command = cmd, outputs = {"distribution_kit/" .. v[1]}} @@ -922,18 +935,19 @@ for i,v in ipairs(distr_extra_files) do end -- build kolibri.raw -raw_mbr = "../programs/hd_load/usb_boot/mbr" -raw_bootsector = "../kernel/trunk/bootloader/extended_primary_loader/fat32/bootsect.bin" +VAR_KOLIBRI_RAW = VAR_DATA .. "/kolibri.raw" +raw_mbr = SRC_PROGS .. "/hd_load/usb_boot/mbr" +raw_bootsector = VAR_KERNEL .. "/bootloader/extended_primary_loader/fat32/bootsect.bin" raw_files = { - {"KOLIBRI.IMG", "kolibri.img"}, - {"KORDLDR.F32", "../kernel/trunk/bootloader/extended_primary_loader/fat32/kordldr.f32"}, - {"KERNEL.MNT", "../kernel/trunk/kernel.mnt.ext_loader"}, - {"CONFIG.INI", "../kernel/trunk/bootloader/extended_primary_loader/config.ini"}, - {"EFI/BOOT/BOOTX64.EFI", "../kernel/trunk/bootloader/uefi4kos/bootx64.efi"}, - {"EFI/BOOT/BOOTIA32.EFI", "../kernel/trunk/bootloader/uefi4kos/bootia32.efi"}, - {"EFI/KOLIBRIOS/KOLIBRI.IMG", "kolibri.img"}, - {"EFI/KOLIBRIOS/KOLIBRI.INI", "../kernel/trunk/bootloader/uefi4kos/kolibri.ini"}, - {"EFI/KOLIBRIOS/KOLIBRI.KRN", "../kernel/trunk/kernel.mnt.ext_loader"} + {"KOLIBRI.IMG", VAR_DATA .. "/kolibri.img"}, + {"KORDLDR.F32", VAR_KERNEL .. "/bootloader/extended_primary_loader/fat32/kordldr.f32"}, + {"KERNEL.MNT", VAR_KERNEL .. "/kernel.mnt.ext_loader"}, + {"CONFIG.INI", SRC_KERNEL .. "/bootloader/extended_primary_loader/config.ini"}, + {"EFI/BOOT/BOOTX64.EFI", VAR_KERNEL .. "/bootloader/uefi4kos/bootx64.efi"}, + {"EFI/BOOT/BOOTIA32.EFI", VAR_KERNEL .. "/bootloader/uefi4kos/bootia32.efi"}, + {"EFI/KOLIBRIOS/KOLIBRI.IMG", VAR_DATA .. "/kolibri.img"}, + {"EFI/KOLIBRIOS/KOLIBRI.INI", SRC_KERNEL .. "/bootloader/uefi4kos/kolibri.ini"}, + {"EFI/KOLIBRIOS/KOLIBRI.KRN", VAR_KERNEL .. "/kernel.mnt.ext_loader"} } for i,v in ipairs(img_files) do @@ -944,15 +958,15 @@ end tup.append_table(raw_files, extra_files) -make_raw_command = '^ MKRAW kolibri.raw^ ' -- for tup: don't write full command to logs -make_raw_command = make_raw_command .. "dd if=/dev/zero of=kolibri.raw bs=1MiB count=128 2>&1" -make_raw_command = make_raw_command .. " && parted --script kolibri.raw mktable gpt" -make_raw_command = make_raw_command .. " && parted --script kolibri.raw unit MiB mkpart primary fat32 1 127" -make_raw_command = make_raw_command .. " && parted --script kolibri.raw set 1 esp on" -make_raw_command = make_raw_command .. " && sgdisk kolibri.raw --hybrid 1:EE" -make_raw_command = make_raw_command .. " && dd if=" .. raw_mbr .. " of=kolibri.raw bs=1 count=\\$((0x1b8)) conv=notrunc" -make_raw_command = make_raw_command .. " && dd if=" .. raw_mbr .. " of=kolibri.raw bs=1 count=1 skip=\\$((0x5a)) seek=\\$((0x1be)) conv=notrunc" -make_raw_command = make_raw_command .. " && mformat -i kolibri.raw@@1M -v KOLIBRIOS -T \\$(((128-1-1)*1024*1024/512)) -h 16 -s 32 -H 2048 -c 1 -F -B " .. raw_bootsector .. " ::" +make_raw_command1 = '^ MKRAW kolibri.raw^ ' -- for tup: don't write full command to logs +make_raw_command1 += "dd status=none if=/dev/zero of=" .. VAR_KOLIBRI_RAW .. " bs=1MiB count=128 2>&1" +make_raw_command1 += " && parted --script " .. VAR_KOLIBRI_RAW .. " mktable gpt" +make_raw_command1 += " && parted --script " .. VAR_KOLIBRI_RAW .. " unit MiB mkpart primary fat32 1 127" +make_raw_command1 += " && parted --script " .. VAR_KOLIBRI_RAW .. " set 1 esp on" +make_raw_command1 += " && sgdisk " .. VAR_KOLIBRI_RAW .. " --hybrid 1:EE" +make_raw_command1 += " && dd status=none if=" .. raw_mbr .. " of=" .. VAR_KOLIBRI_RAW .. " bs=1 count=\\$((0x1b8)) conv=notrunc" +make_raw_command1 += " && dd status=none if=" .. raw_mbr .. " of=" .. VAR_KOLIBRI_RAW .. " bs=1 count=1 skip=\\$((0x5a)) seek=\\$((0x1be)) conv=notrunc" +make_raw_command1 += " && mformat -i " .. VAR_KOLIBRI_RAW .. "@@1M -v KOLIBRIOS -T \\$(((128-1-1)*1024*1024/512)) -h 16 -s 32 -H 2048 -c 1 -F -B " .. raw_bootsector .. " ::" -- generate list of directories to be created inside kolibri.raw raw_dirs = {} @@ -982,7 +996,7 @@ raw_dirs = raw_dirs_sorted -- make folders table.sort(raw_dirs) for _, dir in pairs(raw_dirs) do - make_raw_command = make_raw_command .. ' && mmd -i kolibri.raw@@1M "::' .. dir .. '"' + make_raw_command1 += ' && mmd -i ' .. VAR_KOLIBRI_RAW .. '@@1M "::' .. dir .. '"' end -- Put copying of raw_files into separate scripts to avoid 'execl: Argument list too long' @@ -991,20 +1005,21 @@ make_raw_command3 = "true" -- copy files for i,v in ipairs(raw_files) do local_file = v[2] - cmd = ' && mcopy -moi kolibri.raw@@1M "' .. local_file .. '" "::' .. v[1] .. '"' - if i < 1024 then -- 1024 commands require ~100kiB which is below 128kiB with some margin - make_raw_command2 = make_raw_command2 .. cmd + cmd = ' && mcopy -moi ' .. VAR_KOLIBRI_RAW .. '@@1M "' .. local_file .. '" "::' .. v[1] .. '"' + if i < 900 then -- 900 commands require ~100kiB which is below 128kiB with some margin + make_raw_command2 += cmd else - make_raw_command3 = make_raw_command3 .. cmd + make_raw_command3 += cmd end + table.insert(input_deps, v.group or local_file) end -make_raw_command2_file = "make_raw_command2_file" -make_raw_command3_file = "make_raw_command3_file" -tup.definerule{inputs = {}, command = "echo '" .. make_raw_command2 .. "' > " .. make_raw_command2_file, outputs = {make_raw_command2_file}} -tup.definerule{inputs = {}, command = "echo '" .. make_raw_command3 .. "' > " .. make_raw_command3_file, outputs = {make_raw_command3_file}} +tup.definerule{inputs = {}, command = "echo '" .. make_raw_command1 .. "' > %o", outputs = {'make_raw_command1_file'}} +tup.definerule{inputs = {}, command = "echo '" .. make_raw_command2 .. "' > %o", outputs = {'make_raw_command2_file'}} +tup.definerule{inputs = {}, command = "echo '" .. make_raw_command3 .. "' > %o", outputs = {'make_raw_command3_file'}} -table.insert(input_deps, make_raw_command2_file) -table.insert(input_deps, make_raw_command3_file) +table.insert(input_deps, 'make_raw_command1_file') +table.insert(input_deps, 'make_raw_command2_file') +table.insert(input_deps, 'make_raw_command3_file') -- generate tup rule for kolibri.raw -tup.definerule{inputs = input_deps, command = make_raw_command .. " && bash " .. make_raw_command2_file .. " && bash " .. make_raw_command3_file, outputs = {"kolibri.raw"}} +tup.definerule{inputs = input_deps, command = make_raw_command1 .. " && bash " .. VAR_DATA .. "/make_raw_command2_file && bash " .. VAR_DATA .. "/make_raw_command3_file", outputs = {"kolibri.raw"}} diff --git a/drivers/audio/a5536/Tupfile.lua b/drivers/audio/a5536/Tupfile.lua index 76a5e3b04f..f74d5360a3 100644 --- a/drivers/audio/a5536/Tupfile.lua +++ b/drivers/audio/a5536/Tupfile.lua @@ -7,7 +7,7 @@ INCLUDES = string.format(" -I. -I. -I%s/include -I%s/include/linux -I%s/include/ DEFINES = [[ -D__KERNEL__ -DGEODE_LOG="\"/tmp0/1/geode.log"\" -DCONFIG_X86_32 -DCONFIG_X86_L1_CACHE_SHIFT=6 -DCONFIG_ARCH_HAS_CACHE_LINE_SIZE -DCONFIG_PRINTK -DCONFIG_PCI ]] CFLAGS = " -Os -fomit-frame-pointer -fno-builtin-printf " .. DEFINES -LDFLAGS = " -nostdlib -shared -s --image-base 0 --file-alignment 512 --section-alignment 4096 -L../../ddk " +LDFLAGS = " -nostdlib -shared -s --image-base 0 --file-alignment 512 --section-alignment 4096 -L" .. tup.getvariantdir() .. "/../../ddk " NAME = "geode.sys" diff --git a/drivers/ddk/Tupfile.lua b/drivers/ddk/Tupfile.lua index 326dac31c0..a27c9ef0d2 100644 --- a/drivers/ddk/Tupfile.lua +++ b/drivers/ddk/Tupfile.lua @@ -75,4 +75,4 @@ DDK_SRC = { compile_gcc(DDK_SRC) tup.rule(OBJS, "kos32-ar -crs %o %f", {"libddk.a", extra_outputs={""}}); tup.rule("core.S", "kos32-as %f -o %o", "core.o"); -tup.rule("core.o", "kos32-ld -shared -s --out-implib %o --output-def core.def -o core.dll %f", {"libcore.a", extra_outputs={"core.def", "core.dll", ""}}); +tup.rule("core.o", "kos32-ld -shared -s --out-implib %o --output-def " .. tup.getvariantdir() .. "/%B.def -o " .. tup.getvariantdir() .. "/%B.dll %f", {"libcore.a", extra_outputs={"core.def", "core.dll", ""}}); diff --git a/drivers/devman/Tupfile.lua b/drivers/devman/Tupfile.lua index fe0603bc8a..f2ae50b42d 100755 --- a/drivers/devman/Tupfile.lua +++ b/drivers/devman/Tupfile.lua @@ -9,7 +9,7 @@ DEFINES = " -D__KERNEL__ -DCONFIG_X86_32 -DCONFIG_X86_L1_CACHE_SHIFT=6 -DCONFIG_ CFLAGS = " -w -Os -march=i686 -fno-ident -msse2 -fomit-frame-pointer -fno-builtin-printf -mno-stack-arg-probe -mpreferred-stack-boundary=2 -mincoming-stack-boundary=2 -mno-ms-bitfields " .. DEFINES -LDFLAGS = " -nostdlib -T acpi.lds -shared -s --image-base 0 --file-alignment 512 --section-alignment 4096 -L../../contrib/sdk/lib -L../ddk -Lacpica " +LDFLAGS = " -nostdlib -T acpi.lds -shared -s --image-base 0 --file-alignment 512 --section-alignment 4096 -L../../contrib/sdk/lib -L" .. tup.getvariantdir() .. "/../ddk -L" .. tup.getvariantdir() .. "/acpica " NAME = "acpi.sys" diff --git a/drivers/sensors/k10temp/Tupfile.lua b/drivers/sensors/k10temp/Tupfile.lua index f5bf8a6e9e..98979c327a 100644 --- a/drivers/sensors/k10temp/Tupfile.lua +++ b/drivers/sensors/k10temp/Tupfile.lua @@ -7,7 +7,7 @@ tup.include(HELPERDIR .. "/use_gcc.lua") CFLAGS =[[ -std=gnu99 -Os -march=i686 -fno-ident -msse2 -fomit-frame-pointer -fno-builtin-printf -mno-stack-arg-probe -mpreferred-stack-boundary=2 -mincoming-stack-boundary=2 -mno-ms-bitfields -UWIN32 -U_WIN32 -U__WIN32__ -D_KOLIBRI -DKOLIBRI -D__KERNEL__ -DCONFIG_X86_32 -DCONFIG_DMI -DCONFIG_TINY_RCU -DCONFIG_X86_L1_CACHE_SHIFT=6 -DCONFIG_ARCH_HAS_CACHE_LINE_SIZE -DCONFIG_PRINTK -DCONFIG_PCI -DCONFIG_PCI -DCONFIG_AMD_NB -DKBUILD_MODNAME="\"k10temp"\" -I../../include -I../../include/asm -I../../include/uapi -I../../include/drm ]] -LDFLAGS = " -nostdlib -shared -s --major-os-version 0 --minor-os-version 7 --major-subsystem-version 0 --minor-subsystem-version 5 --subsystem native -T../drv.lds --image-base 0 --file-alignment 512 --section-alignment 4096 -L../../../contrib/sdk/lib -L../../ddk " +LDFLAGS = " -nostdlib -shared -s --major-os-version 0 --minor-os-version 7 --major-subsystem-version 0 --minor-subsystem-version 5 --subsystem native -T../drv.lds --image-base 0 --file-alignment 512 --section-alignment 4096 -L../../../contrib/sdk/lib -L" .. tup.getvariantdir() .. "/../../ddk " LIBS = " -lddk -lcore -lgcc " diff --git a/kernel/branches/kolibri-ahci/Tupfile.lua b/kernel/branches/kolibri-ahci/Tupfile.lua index cbed9e8c80..0b3331b11e 100644 --- a/kernel/branches/kolibri-ahci/Tupfile.lua +++ b/kernel/branches/kolibri-ahci/Tupfile.lua @@ -1,7 +1,11 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o ", "bootbios.bin") -tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, "fasm -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") -tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin.ext_loader", "lang.inc"}}, "fasm -m 65536 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 65536 %f %o -dUEFI=1 -dextended_primary_loader=1", "kolibri.krn") +tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin") +tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") +tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin.ext_loader", "lang.inc"}}, FASM .. " -m 65536 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o -dUEFI=1 -dextended_primary_loader=1", "kolibri.krn") diff --git a/kernel/branches/kolibri-ahci/bootloader/Tupfile.lua b/kernel/branches/kolibri-ahci/bootloader/Tupfile.lua index 087b722530..8192ffde6f 100644 --- a/kernel/branches/kolibri-ahci/bootloader/Tupfile.lua +++ b/kernel/branches/kolibri-ahci/bootloader/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o", "boot_fat12.bin") +tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o", "boot_fat12.bin") diff --git a/kernel/branches/kolibri-lldw/Tupfile.lua b/kernel/branches/kolibri-lldw/Tupfile.lua index cbed9e8c80..0b3331b11e 100644 --- a/kernel/branches/kolibri-lldw/Tupfile.lua +++ b/kernel/branches/kolibri-lldw/Tupfile.lua @@ -1,7 +1,11 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o ", "bootbios.bin") -tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, "fasm -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") -tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin.ext_loader", "lang.inc"}}, "fasm -m 65536 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 65536 %f %o -dUEFI=1 -dextended_primary_loader=1", "kolibri.krn") +tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin") +tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") +tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin.ext_loader", "lang.inc"}}, FASM .. " -m 65536 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o -dUEFI=1 -dextended_primary_loader=1", "kolibri.krn") diff --git a/kernel/branches/kolibri-lldw/bootloader/Tupfile.lua b/kernel/branches/kolibri-lldw/bootloader/Tupfile.lua index 087b722530..8192ffde6f 100644 --- a/kernel/branches/kolibri-lldw/bootloader/Tupfile.lua +++ b/kernel/branches/kolibri-lldw/bootloader/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o", "boot_fat12.bin") +tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o", "boot_fat12.bin") diff --git a/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua b/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua index cbed9e8c80..0b3331b11e 100644 --- a/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua +++ b/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua @@ -1,7 +1,11 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o ", "bootbios.bin") -tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, "fasm -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") -tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin.ext_loader", "lang.inc"}}, "fasm -m 65536 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 65536 %f %o -dUEFI=1 -dextended_primary_loader=1", "kolibri.krn") +tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin") +tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") +tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin.ext_loader", "lang.inc"}}, FASM .. " -m 65536 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o -dUEFI=1 -dextended_primary_loader=1", "kolibri.krn") diff --git a/kernel/branches/kolibrios-pe-clevermouse/bootloader/Tupfile.lua b/kernel/branches/kolibrios-pe-clevermouse/bootloader/Tupfile.lua index 087b722530..8192ffde6f 100644 --- a/kernel/branches/kolibrios-pe-clevermouse/bootloader/Tupfile.lua +++ b/kernel/branches/kolibrios-pe-clevermouse/bootloader/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o", "boot_fat12.bin") +tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o", "boot_fat12.bin") diff --git a/kernel/trunk/Tupfile.lua b/kernel/trunk/Tupfile.lua index cfcc3610c8..52dfdec03f 100644 --- a/kernel/trunk/Tupfile.lua +++ b/kernel/trunk/Tupfile.lua @@ -1,8 +1,12 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 262144 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") ---tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 262144 %f %o -s %o.fas" .. tup.getconfig("KERPACK_CMD"), {"kernel.mnt", extra_outputs = {"kernel.mnt.fas"}}) +tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") +--tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o -s %o.fas" .. tup.getconfig("KERPACK_CMD"), {"kernel.mnt", extra_outputs = {"kernel.mnt.fas"}}) --tup.rule({"kernel.mnt.fas", extra_inputs = {"kernel.mnt"}}, "symbols %f %o", "kernel.mnt.sym") --tup.rule({"kernel.mnt.fas", extra_inputs = {"kernel.mnt"}}, "listing %f %o", "kernel.mnt.lst") -tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 262144 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") -tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, "fasm -m 262144 %f %o -dpretest_build=1 -ddebug_com_base=0xe9", "kernel.mnt.pretest") +tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o -dextended_primary_loader=1" .. tup.getconfig("KERPACK_CMD"), "kernel.mnt.ext_loader") +tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o -dpretest_build=1 -ddebug_com_base=0xe9", "kernel.mnt.pretest") diff --git a/kernel/trunk/bootloader/Tupfile.lua b/kernel/trunk/bootloader/Tupfile.lua index 087b722530..48605444d9 100644 --- a/kernel/trunk/bootloader/Tupfile.lua +++ b/kernel/trunk/bootloader/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) -tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o", "boot_fat12.bin") +tup.rule({"boot_fat12.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o", "boot_fat12.bin") diff --git a/programs/cmm/app_plus/Tupfile.lua b/programs/cmm/app_plus/Tupfile.lua index f666b7c7db..99d60344ca 100644 --- a/programs/cmm/app_plus/Tupfile.lua +++ b/programs/cmm/app_plus/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("app_plus.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "app_plus.com") +tup.rule("app_plus.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "app_plus.com") diff --git a/programs/cmm/appearance/Tupfile.lua b/programs/cmm/appearance/Tupfile.lua index bca006af70..4c03d23b03 100644 --- a/programs/cmm/appearance/Tupfile.lua +++ b/programs/cmm/appearance/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("appearance.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "appearance.com") +tup.rule("appearance.c", "c-- /D=AUTOBUILD /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "appearance.com") diff --git a/programs/cmm/barscfg/Tupfile.lua b/programs/cmm/barscfg/Tupfile.lua index a0ba32290a..6cb57b5eb3 100644 --- a/programs/cmm/barscfg/Tupfile.lua +++ b/programs/cmm/barscfg/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("barscfg.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com") +tup.rule("barscfg.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com") diff --git a/programs/cmm/browser/Tupfile.lua b/programs/cmm/browser/Tupfile.lua index ced439d3e7..8efaba7222 100644 --- a/programs/cmm/browser/Tupfile.lua +++ b/programs/cmm/browser/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("WebView.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "WebView.com") +tup.rule("WebView.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "WebView.com") diff --git a/programs/cmm/clipview/Tupfile.lua b/programs/cmm/clipview/Tupfile.lua index 8836dbc7b3..e51f7875c7 100644 --- a/programs/cmm/clipview/Tupfile.lua +++ b/programs/cmm/clipview/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("clipview.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "clipview.com") +tup.rule("clipview.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "clipview.com") diff --git a/programs/cmm/dicty/Tupfile.lua b/programs/cmm/dicty/Tupfile.lua index aebdbfe418..519f94c842 100644 --- a/programs/cmm/dicty/Tupfile.lua +++ b/programs/cmm/dicty/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("dicty.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dicty.com") +tup.rule("dicty.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "dicty.com") diff --git a/programs/cmm/diff/Tupfile.lua b/programs/cmm/diff/Tupfile.lua index 457fdbbfb2..126690e347 100644 --- a/programs/cmm/diff/Tupfile.lua +++ b/programs/cmm/diff/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("diff.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "diff.com") +tup.rule("diff.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "diff.com") diff --git a/programs/cmm/downloader/Tupfile.lua b/programs/cmm/downloader/Tupfile.lua index 77c91b6757..0dc9e053d8 100644 --- a/programs/cmm/downloader/Tupfile.lua +++ b/programs/cmm/downloader/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("dl.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dl.com") +tup.rule("dl.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "dl.com") diff --git a/programs/cmm/drvinst/Tupfile.lua b/programs/cmm/drvinst/Tupfile.lua index 44ef26aed8..3dafa24022 100644 --- a/programs/cmm/drvinst/Tupfile.lua +++ b/programs/cmm/drvinst/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("drvinst.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "drvinst.com") +tup.rule("drvinst.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "drvinst.com") diff --git a/programs/cmm/eolite/Tupfile.lua b/programs/cmm/eolite/Tupfile.lua index 4ea3222b4a..dd9f2f6c8b 100644 --- a/programs/cmm/eolite/Tupfile.lua +++ b/programs/cmm/eolite/Tupfile.lua @@ -11,6 +11,6 @@ end LFLAGS = LFLAGS .. " -stack=20480" LIBS = LIBS .. " ../../develop/ktcc/trunk/bin/lib/tiny.o -nostdlib -lbox_lib -lini -limg" -tup.rule("Eolite.c", "c-- -coff /D=" .. C_LANG .. " %f %o", "%B.obj") +tup.rule("Eolite.c", "c-- -coff /D=" .. C_LANG .. " /OPATH=%o %f", "%B.obj") tup.rule("Eolite.obj", "objconv -felf32 %f %o", "%B.o") link_tcc("Eolite.o", "%B.com") diff --git a/programs/cmm/examples/Tupfile.lua b/programs/cmm/examples/Tupfile.lua index cd57a8830c..64e2983826 100644 --- a/programs/cmm/examples/Tupfile.lua +++ b/programs/cmm/examples/Tupfile.lua @@ -3,10 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("window.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "window.com") -tup.rule("collections.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "collections.com") -tup.rule("menu.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com") -tup.rule("rgb.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com") -tup.rule("console.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com") -tup.rule("pigex.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com") -tup.rule("math.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "math.com") +tup.foreach_rule("*.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "%B.com") diff --git a/programs/cmm/iconedit/Tupfile.lua b/programs/cmm/iconedit/Tupfile.lua index e42f410670..f9c8d8d000 100644 --- a/programs/cmm/iconedit/Tupfile.lua +++ b/programs/cmm/iconedit/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("iconedit.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com") +tup.rule("iconedit.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com") diff --git a/programs/cmm/imgedit/Tupfile.lua b/programs/cmm/imgedit/Tupfile.lua index d1a48b378b..cdb4e4d3d3 100644 --- a/programs/cmm/imgedit/Tupfile.lua +++ b/programs/cmm/imgedit/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("imgedit.c", "c-- %f" .. tup.getconfig("KPACK_CMD"), "imgedit.com") +tup.rule("imgedit.c", "c-- /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "imgedit.com") diff --git a/programs/cmm/kf_font_viewer/Tupfile.lua b/programs/cmm/kf_font_viewer/Tupfile.lua index b9ae62b316..3ef2780744 100644 --- a/programs/cmm/kf_font_viewer/Tupfile.lua +++ b/programs/cmm/kf_font_viewer/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("font_viewer.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com") +tup.rule("font_viewer.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com") diff --git a/programs/cmm/menu/Tupfile.lua b/programs/cmm/menu/Tupfile.lua index 4fcd5f42f8..3a7ef85866 100644 --- a/programs/cmm/menu/Tupfile.lua +++ b/programs/cmm/menu/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("menu.c", "c-- %f" .. tup.getconfig("KPACK_CMD"), "menu.com") +tup.rule("menu.c", "c-- /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "menu.com") diff --git a/programs/cmm/misc/Tupfile.lua b/programs/cmm/misc/Tupfile.lua index b65b24563c..665bc17f96 100644 --- a/programs/cmm/misc/Tupfile.lua +++ b/programs/cmm/misc/Tupfile.lua @@ -3,14 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("acpi_install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "acpi_install.com") -tup.rule("easyshot.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "easyshot.com") -tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com") -tup.rule("mblocks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mblocks.com") -tup.rule("notify.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notify.com") -tup.rule("osupdate.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "osupdate.com") -tup.rule("pipet.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pipet.com") -tup.rule("software_widget.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "software_widget.com") -tup.rule("reshare.c", "c-- %f" .. tup.getconfig("KPACK_CMD"), "reshare.com") -tup.rule("kfm2.c", "c-- %f" .. tup.getconfig("KPACK_CMD"), "kfm2.com") - +tup.foreach_rule("*.c", "c-- /D=AUTOBUILD /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "%B.com") diff --git a/programs/cmm/mousecfg/Tupfile.lua b/programs/cmm/mousecfg/Tupfile.lua index 5e61c62445..1cc8cadbf7 100644 --- a/programs/cmm/mousecfg/Tupfile.lua +++ b/programs/cmm/mousecfg/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("mousecfg.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com") +tup.rule("mousecfg.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com") diff --git a/programs/cmm/notes/Tupfile.lua b/programs/cmm/notes/Tupfile.lua index c29cd23fa2..7f3f60fd4d 100644 --- a/programs/cmm/notes/Tupfile.lua +++ b/programs/cmm/notes/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("notes.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notes.com") +tup.rule("notes.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "notes.com") diff --git a/programs/cmm/pixie2/Tupfile.lua b/programs/cmm/pixie2/Tupfile.lua index d3802d0f4d..86fdc7bb30 100644 --- a/programs/cmm/pixie2/Tupfile.lua +++ b/programs/cmm/pixie2/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("pixie.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pixie.com") +tup.rule("pixie.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "pixie.com") diff --git a/programs/cmm/quark/Tupfile.lua b/programs/cmm/quark/Tupfile.lua index dbcbd6a9c5..3e420412f6 100644 --- a/programs/cmm/quark/Tupfile.lua +++ b/programs/cmm/quark/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("quark.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "quark.com") +tup.rule("quark.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "quark.com") diff --git a/programs/cmm/search/Tupfile.lua b/programs/cmm/search/Tupfile.lua index d54a4bbd1f..0fd292c318 100644 --- a/programs/cmm/search/Tupfile.lua +++ b/programs/cmm/search/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("search.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "search.com") +tup.rule("search.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "search.com") diff --git a/programs/cmm/sysmon/Tupfile.lua b/programs/cmm/sysmon/Tupfile.lua index 271b8b9db9..1f90427c97 100644 --- a/programs/cmm/sysmon/Tupfile.lua +++ b/programs/cmm/sysmon/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("sysmon.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "sysmon.com") +tup.rule("sysmon.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "sysmon.com") diff --git a/programs/cmm/taskbar2/Tupfile.lua b/programs/cmm/taskbar2/Tupfile.lua index bb41347a55..5a8fc51ca5 100644 --- a/programs/cmm/taskbar2/Tupfile.lua +++ b/programs/cmm/taskbar2/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("taskbar2.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "taskbar2.com") +tup.rule("taskbar2.c", "c-- /D=AUTOBUILD /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "taskbar2.com") diff --git a/programs/cmm/the_bus/Tupfile.lua b/programs/cmm/the_bus/Tupfile.lua index de47c9cdac..484503c8ef 100644 --- a/programs/cmm/the_bus/Tupfile.lua +++ b/programs/cmm/the_bus/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("the_bus.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "the_bus.com") +tup.rule("the_bus.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "the_bus.com") diff --git a/programs/cmm/tmpdisk/Tupfile.lua b/programs/cmm/tmpdisk/Tupfile.lua index b7c46c8a29..0662698e65 100644 --- a/programs/cmm/tmpdisk/Tupfile.lua +++ b/programs/cmm/tmpdisk/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("tmpdisk.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "tmpdisk.com") +tup.rule("tmpdisk.c", "c-- /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "tmpdisk.com") diff --git a/programs/demos/3dcube2/trunk/Tupfile.lua b/programs/demos/3dcube2/trunk/Tupfile.lua index 0809f54f78..8b1b05e110 100644 --- a/programs/demos/3dcube2/trunk/Tupfile.lua +++ b/programs/demos/3dcube2/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"3DCUBE2.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "3DCUBE2") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"3DCUBE2.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "3DCUBE2") diff --git a/programs/demos/3detx60b/trunk/Tupfile.lua b/programs/demos/3detx60b/trunk/Tupfile.lua index 76d76543a1..ae73523266 100644 --- a/programs/demos/3detx60b/trunk/Tupfile.lua +++ b/programs/demos/3detx60b/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"3DETX60B.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "3DETX60B") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"3DETX60B.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "3DETX60B") diff --git a/programs/demos/3dtcub10/trunk/Tupfile.lua b/programs/demos/3dtcub10/trunk/Tupfile.lua index 42f82c18a2..e470a6999b 100644 --- a/programs/demos/3dtcub10/trunk/Tupfile.lua +++ b/programs/demos/3dtcub10/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"3DTCUB10.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "3DTCUB10") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"3DTCUB10.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "3DTCUB10") diff --git a/programs/demos/PlasmaEffect/Tupfile.lua b/programs/demos/PlasmaEffect/Tupfile.lua index 922717508a..e9b249e949 100644 --- a/programs/demos/PlasmaEffect/Tupfile.lua +++ b/programs/demos/PlasmaEffect/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig('NO_JWASM') ~= "" or tup.getconfig("NO_GCC") ~= "" then return end - -tup.rule({"PlasmaEffect.asm"}, "jwasm -zt0 -coff %f ", "PlasmaEffect.o") -tup.rule("PlasmaEffect.o", "kos32-ld -T LScript.x -o %o %f -L ../../../contrib/sdk/lib -l KolibriOS && kos32-objcopy %o -O binary -j .all" .. tup.getconfig("KPACK_CMD"),"PlasmaEffect") \ No newline at end of file + +tup.rule({"PlasmaEffect.asm"}, "jwasm -zt0 -coff -Fo %o %f ", "PlasmaEffect.o") +tup.rule("PlasmaEffect.o", "kos32-ld -T LScript.x -o %o %f -L ../../../contrib/sdk/lib -l KolibriOS && kos32-objcopy %o -O binary -j .all" .. tup.getconfig("KPACK_CMD"),"PlasmaEffect") diff --git a/programs/demos/ScreenRuler/Tupfile.lua b/programs/demos/ScreenRuler/Tupfile.lua index 6311fd8343..6ab42fcfb2 100644 --- a/programs/demos/ScreenRuler/Tupfile.lua +++ b/programs/demos/ScreenRuler/Tupfile.lua @@ -1,3 +1,7 @@ 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({"ScreenRuler.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "ScreenRuler") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"ScreenRuler.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ScreenRuler") diff --git a/programs/demos/bcdclk/trunk/Tupfile.lua b/programs/demos/bcdclk/trunk/Tupfile.lua index 99f712846e..57055d8552 100644 --- a/programs/demos/bcdclk/trunk/Tupfile.lua +++ b/programs/demos/bcdclk/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"bcdclk.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "bcdclk") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"bcdclk.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bcdclk") diff --git a/programs/demos/colorref/trunk/Tupfile.lua b/programs/demos/colorref/trunk/Tupfile.lua index dc478d38dd..46e2b06a12 100644 --- a/programs/demos/colorref/trunk/Tupfile.lua +++ b/programs/demos/colorref/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"colorref.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "colorref") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"colorref.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "colorref") diff --git a/programs/demos/crownscr/trunk/Tupfile.lua b/programs/demos/crownscr/trunk/Tupfile.lua index 0a1efa30b0..dcde006480 100644 --- a/programs/demos/crownscr/trunk/Tupfile.lua +++ b/programs/demos/crownscr/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"crownscr.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "crownscr") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"crownscr.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "crownscr") diff --git a/programs/demos/cslide/trunk/Tupfile.lua b/programs/demos/cslide/trunk/Tupfile.lua index 5f0dd9fa13..048ff7bc33 100644 --- a/programs/demos/cslide/trunk/Tupfile.lua +++ b/programs/demos/cslide/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"cslide.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cslide") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cslide.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cslide") diff --git a/programs/demos/eyes/trunk/Tupfile.lua b/programs/demos/eyes/trunk/Tupfile.lua index 6a5daef710..dec502f8e6 100644 --- a/programs/demos/eyes/trunk/Tupfile.lua +++ b/programs/demos/eyes/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"eyes.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "eyes") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"eyes.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "eyes") diff --git a/programs/demos/free3d04/trunk/Tupfile.lua b/programs/demos/free3d04/trunk/Tupfile.lua index a5b6f98f98..bc32201f23 100644 --- a/programs/demos/free3d04/trunk/Tupfile.lua +++ b/programs/demos/free3d04/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"free3d04.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "free3d04") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"free3d04.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "free3d04") diff --git a/programs/demos/magnify/trunk/Tupfile.lua b/programs/demos/magnify/trunk/Tupfile.lua index b7bf47d0b0..6366f3993f 100644 --- a/programs/demos/magnify/trunk/Tupfile.lua +++ b/programs/demos/magnify/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"magnify.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "magnify") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"magnify.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "magnify") diff --git a/programs/demos/movback/trunk/Tupfile.lua b/programs/demos/movback/trunk/Tupfile.lua index ccd160d789..87c81eded9 100644 --- a/programs/demos/movback/trunk/Tupfile.lua +++ b/programs/demos/movback/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"movback.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "movback") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"movback.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "movback") diff --git a/programs/demos/plasma/trunk/Tupfile.lua b/programs/demos/plasma/trunk/Tupfile.lua index ad704145f6..38a00ae246 100644 --- a/programs/demos/plasma/trunk/Tupfile.lua +++ b/programs/demos/plasma/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"plasma.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "plasma") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"plasma.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "plasma") diff --git a/programs/demos/ray/Tupfile.lua b/programs/demos/ray/Tupfile.lua index b37b7abb54..3c7bd4c148 100644 --- a/programs/demos/ray/Tupfile.lua +++ b/programs/demos/ray/Tupfile.lua @@ -1,3 +1,7 @@ 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({"ray.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "ray") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"ray.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ray") diff --git a/programs/demos/timer/trunk/Tupfile.lua b/programs/demos/timer/trunk/Tupfile.lua index 564aba7633..789b97a25d 100644 --- a/programs/demos/timer/trunk/Tupfile.lua +++ b/programs/demos/timer/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"timer.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "timer") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"timer.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "timer") diff --git a/programs/demos/tinyfrac/trunk/Tupfile.lua b/programs/demos/tinyfrac/trunk/Tupfile.lua index 88c02303b9..e05df2103e 100644 --- a/programs/demos/tinyfrac/trunk/Tupfile.lua +++ b/programs/demos/tinyfrac/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"tinyfrac.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "tinyfrac") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"tinyfrac.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tinyfrac") diff --git a/programs/demos/transp/trunk/Tupfile.lua b/programs/demos/transp/trunk/Tupfile.lua index e26502c644..d37456f142 100644 --- a/programs/demos/transp/trunk/Tupfile.lua +++ b/programs/demos/transp/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"transp.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "transp") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"transp.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "transp") diff --git a/programs/demos/trantest/trunk/Tupfile.lua b/programs/demos/trantest/trunk/Tupfile.lua index e5a695b502..fe993b0682 100644 --- a/programs/demos/trantest/trunk/Tupfile.lua +++ b/programs/demos/trantest/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"trantest.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "trantest") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"trantest.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "trantest") diff --git a/programs/demos/use_mb/Tupfile.lua b/programs/demos/use_mb/Tupfile.lua index f1c2641dee..4d9eb49ce1 100644 --- a/programs/demos/use_mb/Tupfile.lua +++ b/programs/demos/use_mb/Tupfile.lua @@ -1,3 +1,7 @@ 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({"use_mb.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "use_mb") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"use_mb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "use_mb") diff --git a/programs/develop/cObj/trunk/Tupfile.lua b/programs/develop/cObj/trunk/Tupfile.lua index 22ceb1bc6c..6b3170d6a0 100644 --- a/programs/develop/cObj/trunk/Tupfile.lua +++ b/programs/develop/cObj/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"cObj.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cObj") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cObj.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cObj") diff --git a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua b/programs/develop/examples/cpuspeed/trunk/Tupfile.lua index 063c3cbb0e..f73d1268f0 100644 --- a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua +++ b/programs/develop/examples/cpuspeed/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"cpuspeed.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cpuspeed") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cpuspeed.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cpuspeed") diff --git a/programs/develop/examples/example2/trunk/Tupfile.lua b/programs/develop/examples/example2/trunk/Tupfile.lua index 4df254fc4c..b9f102316c 100644 --- a/programs/develop/examples/example2/trunk/Tupfile.lua +++ b/programs/develop/examples/example2/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"example2.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "example2") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"example2.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "example2") diff --git a/programs/develop/examples/example3/trunk/Tupfile.lua b/programs/develop/examples/example3/trunk/Tupfile.lua index 10f9766d64..860b17de62 100644 --- a/programs/develop/examples/example3/trunk/Tupfile.lua +++ b/programs/develop/examples/example3/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"example3.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "example3") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"example3.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "example3") diff --git a/programs/develop/examples/hello/trunk/Tupfile.lua b/programs/develop/examples/hello/trunk/Tupfile.lua index bd514f338c..c3f45d89f8 100644 --- a/programs/develop/examples/hello/trunk/Tupfile.lua +++ b/programs/develop/examples/hello/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"hello.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "hello") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"hello.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "hello") diff --git a/programs/develop/examples/ipc/trunk/Tupfile.lua b/programs/develop/examples/ipc/trunk/Tupfile.lua index 42f23e3adf..f8323d5571 100644 --- a/programs/develop/examples/ipc/trunk/Tupfile.lua +++ b/programs/develop/examples/ipc/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"ipc.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "ipc") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"ipc.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ipc") diff --git a/programs/develop/examples/ir/trunk/Tupfile.lua b/programs/develop/examples/ir/trunk/Tupfile.lua index 3977efd083..089a26aa7c 100644 --- a/programs/develop/examples/ir/trunk/Tupfile.lua +++ b/programs/develop/examples/ir/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"ir.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "ir") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"ir.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ir") diff --git a/programs/develop/examples/rtdata/trunk/Tupfile.lua b/programs/develop/examples/rtdata/trunk/Tupfile.lua index eaed7d71a6..8407fdcbba 100644 --- a/programs/develop/examples/rtdata/trunk/Tupfile.lua +++ b/programs/develop/examples/rtdata/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"rtdata.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "rtdata") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"rtdata.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rtdata") diff --git a/programs/develop/examples/template/trunk/Tupfile.lua b/programs/develop/examples/template/trunk/Tupfile.lua index 6ce5d920cb..f1ec0f96c6 100644 --- a/programs/develop/examples/template/trunk/Tupfile.lua +++ b/programs/develop/examples/template/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"template.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "template") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"template.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "template") diff --git a/programs/develop/examples/thread/trunk/Tupfile.lua b/programs/develop/examples/thread/trunk/Tupfile.lua index ce77117f71..d24b77420a 100644 --- a/programs/develop/examples/thread/trunk/Tupfile.lua +++ b/programs/develop/examples/thread/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"thread.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "thread") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"thread.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "thread") diff --git a/programs/develop/fasm/1.73/Tupfile.lua b/programs/develop/fasm/1.73/Tupfile.lua index c6f8d0d197..5b37ef2cda 100644 --- a/programs/develop/fasm/1.73/Tupfile.lua +++ b/programs/develop/fasm/1.73/Tupfile.lua @@ -1,3 +1,7 @@ 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({"fasm.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "fasm") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"fasm.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "fasm") diff --git a/programs/develop/fasm/tags/1.71/Tupfile.lua b/programs/develop/fasm/tags/1.71/Tupfile.lua index c6f8d0d197..837b68e2a4 100644 --- a/programs/develop/fasm/tags/1.71/Tupfile.lua +++ b/programs/develop/fasm/tags/1.71/Tupfile.lua @@ -1,3 +1,7 @@ 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({"fasm.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "fasm") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"fasm.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "fasm") diff --git a/programs/develop/h2d2b/trunk/Tupfile.lua b/programs/develop/h2d2b/trunk/Tupfile.lua index 3f6f327fb5..51065fb38f 100644 --- a/programs/develop/h2d2b/trunk/Tupfile.lua +++ b/programs/develop/h2d2b/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"h2d2b.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "h2d2b") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"h2d2b.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "h2d2b") diff --git a/programs/develop/heed/trunk/Tupfile.lua b/programs/develop/heed/trunk/Tupfile.lua index 3cb86217af..834cca6334 100644 --- a/programs/develop/heed/trunk/Tupfile.lua +++ b/programs/develop/heed/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"heed.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "heed") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"heed.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "heed") diff --git a/programs/develop/info3ds/Tupfile.lua b/programs/develop/info3ds/Tupfile.lua index b3a8c255da..48505b60d9 100644 --- a/programs/develop/info3ds/Tupfile.lua +++ b/programs/develop/info3ds/Tupfile.lua @@ -1,4 +1,8 @@ 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") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"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/keyascii/trunk/Tupfile.lua b/programs/develop/keyascii/trunk/Tupfile.lua index 5f57fa0a51..ef40b3d40d 100644 --- a/programs/develop/keyascii/trunk/Tupfile.lua +++ b/programs/develop/keyascii/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"keyascii.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "keyascii") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"keyascii.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "keyascii") diff --git a/programs/develop/kol_f_edit/Tupfile.lua b/programs/develop/kol_f_edit/Tupfile.lua index dfcb1e967e..759fe5bad8 100644 --- a/programs/develop/kol_f_edit/Tupfile.lua +++ b/programs/develop/kol_f_edit/Tupfile.lua @@ -1,4 +1,8 @@ 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({"kol_f_edit.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "bin/kol_f_edit") -tup.rule({"ob_o.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o", "bin/ob_o.opt") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"kol_f_edit.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bin/kol_f_edit") +tup.rule({"ob_o.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o", "bin/ob_o.opt") diff --git a/programs/develop/libraries/InputBox/Tupfile.lua b/programs/develop/libraries/InputBox/Tupfile.lua index 4944c85b90..8ef1269885 100644 --- a/programs/develop/libraries/InputBox/Tupfile.lua +++ b/programs/develop/libraries/InputBox/Tupfile.lua @@ -1,15 +1,15 @@ if tup.getconfig('NO_JWASM') ~= "" then return end if tup.getconfig("LANG") == "it" then - tup.definerule{command = "echo LANG_IT = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_IT = 1 > %o", outputs = {"lang.inc"}} elseif tup.getconfig("LANG") == "sp" then - tup.definerule{command = "echo LANG_SP = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_SP = 1 > %o", outputs = {"lang.inc"}} elseif tup.getconfig("LANG") == "ru" then - tup.definerule{command = "echo LANG_RU = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_RU = 1 > %o", outputs = {"lang.inc"}} elseif tup.getconfig("LANG") == "en" then - tup.definerule{command = "echo LANG_EN = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} else - tup.definerule{command = "echo LANG_EN = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} end -tup.rule({"InputBox.asm", extra_inputs = {"lang.inc"}}, "jwasm -zt0 -coff -Fi lang.inc -Fo %o %f " .. tup.getconfig("KPACK_CMD"), "INPUTBOX.OBJ") +tup.rule({"InputBox.asm", extra_inputs = {"lang.inc"}}, "jwasm -I" .. tup.getvariantdir() .. " -zt0 -coff -Fi lang.inc -Fo %o %f " .. tup.getconfig("KPACK_CMD"), "INPUTBOX.OBJ") diff --git a/programs/develop/libraries/ufmod/Fasm/Tupfile.lua b/programs/develop/libraries/ufmod/Fasm/Tupfile.lua index f6f917190c..9c5735e33e 100644 --- a/programs/develop/libraries/ufmod/Fasm/Tupfile.lua +++ b/programs/develop/libraries/ufmod/Fasm/Tupfile.lua @@ -1,3 +1,7 @@ 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({"mini.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "mini") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"mini.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mini") diff --git a/programs/develop/scancode/trunk/Tupfile.lua b/programs/develop/scancode/trunk/Tupfile.lua index 2a5c947d2d..63aa5ad691 100644 --- a/programs/develop/scancode/trunk/Tupfile.lua +++ b/programs/develop/scancode/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"scancode.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "scancode") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"scancode.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "scancode") diff --git a/programs/develop/str_double/trunk/Tupfile.lua b/programs/develop/str_double/trunk/Tupfile.lua index 7d5ae87609..37e337453b 100644 --- a/programs/develop/str_double/trunk/Tupfile.lua +++ b/programs/develop/str_double/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"str_double.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "str_double") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"str_double.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "str_double") diff --git a/programs/develop/tinypad/trunk/Tupfile.lua b/programs/develop/tinypad/trunk/Tupfile.lua index ddffda3e30..ff6922ce05 100644 --- a/programs/develop/tinypad/trunk/Tupfile.lua +++ b/programs/develop/tinypad/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"tinypad.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "tinypad") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"tinypad.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tinypad") diff --git a/programs/emulator/e80/trunk/Tupfile.lua b/programs/emulator/e80/trunk/Tupfile.lua index ce9d3b2271..3fdc1d72bd 100644 --- a/programs/emulator/e80/trunk/Tupfile.lua +++ b/programs/emulator/e80/trunk/Tupfile.lua @@ -1,6 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_GCC") ~= "" then return end HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_gcc.lua") +INCLUDES = INCLUDES .. "-I" .. tup.getvariantdir() LDFLAGS = LDFLAGS .. " -T kolibri.ld" if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" diff --git a/programs/fs/copyr/trunk/Tupfile.lua b/programs/fs/copyr/trunk/Tupfile.lua index 77410e5d9a..5348dad85c 100644 --- a/programs/fs/copyr/trunk/Tupfile.lua +++ b/programs/fs/copyr/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"copyr.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "copyr") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"copyr.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "copyr") diff --git a/programs/fs/kfar/trunk/Tupfile.lua b/programs/fs/kfar/trunk/Tupfile.lua index ea13d98a89..c9021f72b1 100644 --- a/programs/fs/kfar/trunk/Tupfile.lua +++ b/programs/fs/kfar/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"kfar.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "kfar") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"kfar.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kfar") diff --git a/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua b/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua index ac790f3ece..a25632f0d0 100644 --- a/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua +++ b/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua @@ -1,3 +1,7 @@ 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({"kfar_arc.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "kfar_arc.obj") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"kfar_arc.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kfar_arc.obj") diff --git a/programs/fs/kfm/trunk/Tupfile.lua b/programs/fs/kfm/trunk/Tupfile.lua index aa94dc651e..be5b046867 100644 --- a/programs/fs/kfm/trunk/Tupfile.lua +++ b/programs/fs/kfm/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"kfm.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "kfm") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"kfm.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kfm") diff --git a/programs/fs/unz/Tupfile.lua b/programs/fs/unz/Tupfile.lua index 2f4a3817db..83809d0068 100644 --- a/programs/fs/unz/Tupfile.lua +++ b/programs/fs/unz/Tupfile.lua @@ -1,3 +1,7 @@ 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({"unz.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "unz") \ No newline at end of file +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"unz.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "unz") diff --git a/programs/games/15/trunk/Tupfile.lua b/programs/games/15/trunk/Tupfile.lua index c8476a247c..ecce0ed2ee 100644 --- a/programs/games/15/trunk/Tupfile.lua +++ b/programs/games/15/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"15.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "15") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"15.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "15") diff --git a/programs/games/FindNumbers/trunk/Tupfile.lua b/programs/games/FindNumbers/trunk/Tupfile.lua index 9fa6ad0455..f9fbfbbeaa 100644 --- a/programs/games/FindNumbers/trunk/Tupfile.lua +++ b/programs/games/FindNumbers/trunk/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("FindNumbers.c--", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "FindNumbers") +tup.rule("FindNumbers.c--", "c-- /D=AUTOBUILD /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "FindNumbers") diff --git a/programs/games/MSquare/trunk/Tupfile.lua b/programs/games/MSquare/trunk/Tupfile.lua index 77779198ee..ab60e202e8 100644 --- a/programs/games/MSquare/trunk/Tupfile.lua +++ b/programs/games/MSquare/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"MSquare.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "MSquare") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"MSquare.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "MSquare") diff --git a/programs/games/almaz/Tupfile.lua b/programs/games/almaz/Tupfile.lua index 4c1df8c733..6c7b0de262 100644 --- a/programs/games/almaz/Tupfile.lua +++ b/programs/games/almaz/Tupfile.lua @@ -1,3 +1,7 @@ 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({"ALMAZ.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "almaz") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"ALMAZ.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "almaz") diff --git a/programs/games/arcanii/trunk/Tupfile.lua b/programs/games/arcanii/trunk/Tupfile.lua index fde91e04ad..beeb9b6319 100644 --- a/programs/games/arcanii/trunk/Tupfile.lua +++ b/programs/games/arcanii/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"arcanii.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "arcanii") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"arcanii.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "arcanii") diff --git a/programs/games/arcanoid/trunk/Tupfile.lua b/programs/games/arcanoid/trunk/Tupfile.lua index d176087e21..005b6a1b06 100644 --- a/programs/games/arcanoid/trunk/Tupfile.lua +++ b/programs/games/arcanoid/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"arcanoid.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "arcanoid") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"arcanoid.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "arcanoid") diff --git a/programs/games/bomber/Tupfile.lua b/programs/games/bomber/Tupfile.lua index b0a45ddde0..0f11a820e8 100644 --- a/programs/games/bomber/Tupfile.lua +++ b/programs/games/bomber/Tupfile.lua @@ -1,3 +1,7 @@ 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({"bomber.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "bomber") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"bomber.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bomber") diff --git a/programs/games/c4/trunk/Tupfile.lua b/programs/games/c4/trunk/Tupfile.lua index f48102743f..5cd196beb0 100644 --- a/programs/games/c4/trunk/Tupfile.lua +++ b/programs/games/c4/trunk/Tupfile.lua @@ -1,7 +1,7 @@ if tup.getconfig("NO_NASM") ~= "" then return end -- tup.rule is too unmannerly to %define tup.definerule{ - command = "echo %%define lang '" .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. "'> lang_nasm.inc", + command = "echo %%define lang '" .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. "'> %o", outputs = {"lang_nasm.inc"} } -tup.rule({"c4.asm", extra_inputs = {"lang_nasm.inc"}}, "nasm -f bin -o %o %f " .. tup.getconfig("KPACK_CMD"), "c4") +tup.rule({"c4.asm", extra_inputs = {"lang_nasm.inc"}}, "nasm -I" .. tup.getvariantdir() .. " -f bin -o %o %f " .. tup.getconfig("KPACK_CMD"), "c4") diff --git a/programs/games/clicks/trunk/Tupfile.lua b/programs/games/clicks/trunk/Tupfile.lua index 8e2ce8c293..0cd64e9551 100644 --- a/programs/games/clicks/trunk/Tupfile.lua +++ b/programs/games/clicks/trunk/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("clicks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "clicks.com") +tup.rule("clicks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) /opath=%o %f" .. tup.getconfig("KPACK_CMD"), "clicks.com") diff --git a/programs/games/codemaster/Tupfile.lua b/programs/games/codemaster/Tupfile.lua index 4d38ac653b..6ecc29f63b 100644 --- a/programs/games/codemaster/Tupfile.lua +++ b/programs/games/codemaster/Tupfile.lua @@ -1,5 +1,9 @@ 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({"binary_master.asm", extra_inputs = {"lang.inc"}}, "fasm -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "binary_master") -tup.rule({"hang_programmer.asm", extra_inputs = {"lang.inc"}}, "fasm -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "hang_programmer") -tup.rule({"kolibri_puzzle.asm", extra_inputs = {"lang.inc"}}, "fasm -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "kolibri_puzzle") \ No newline at end of file +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"binary_master.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "binary_master") +tup.rule({"hang_programmer.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "hang_programmer") +tup.rule({"kolibri_puzzle.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "kolibri_puzzle") diff --git a/programs/games/flood-it/trunk/Tupfile.lua b/programs/games/flood-it/trunk/Tupfile.lua index c2db01b6b5..09e85d8087 100644 --- a/programs/games/flood-it/trunk/Tupfile.lua +++ b/programs/games/flood-it/trunk/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("flood-it.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "flood-it.com") +tup.rule("flood-it.c", "c-- /D=AUTOBUILD /D=$(C_LANG) /OPATH=%o %f" .. tup.getconfig("KPACK_CMD"), "flood-it.com") diff --git a/programs/games/freecell/Tupfile.lua b/programs/games/freecell/Tupfile.lua index 44ac986be3..9bf003511d 100644 --- a/programs/games/freecell/Tupfile.lua +++ b/programs/games/freecell/Tupfile.lua @@ -1,3 +1,7 @@ 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({"freecell.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "freecell") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"freecell.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "freecell") diff --git a/programs/games/fridge/Tupfile.lua b/programs/games/fridge/Tupfile.lua index 3b70753f08..4a47960117 100755 --- a/programs/games/fridge/Tupfile.lua +++ b/programs/games/fridge/Tupfile.lua @@ -7,7 +7,7 @@ tup.include(HELPERDIR .. "/use_newlib.lua") CFLAGS = CFLAGS .. " -std=c99 -Wall -Wextra" INCLUDES = INCLUDES .. " -I../../../contrib/C_Layer/INCLUDE" table.insert(LIBDEPS, "../../../contrib/C_Layer/OBJ/") -LIBS = LIBS .. " ../../../contrib/C_Layer/OBJ/loadlibimg.o" +LIBS = LIBS .. " " .. tup.getvariantdir() .. "/../../../contrib/C_Layer/OBJ/loadlibimg.o " -- Subsystem native LDFLAGS = LDFLAGS .. " --subsystem native" diff --git a/programs/games/gomoku/trunk/Tupfile.lua b/programs/games/gomoku/trunk/Tupfile.lua index 3a88d422c1..f2e99d9c0b 100644 --- a/programs/games/gomoku/trunk/Tupfile.lua +++ b/programs/games/gomoku/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"gomoku.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "gomoku") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"gomoku.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "gomoku") diff --git a/programs/games/klavisha/trunk/Tupfile.lua b/programs/games/klavisha/trunk/Tupfile.lua index 5fa7a868aa..77ef30e1b0 100644 --- a/programs/games/klavisha/trunk/Tupfile.lua +++ b/programs/games/klavisha/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"klavisha.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "klavisha") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"klavisha.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "klavisha") diff --git a/programs/games/life3/trunk/Tupfile.lua b/programs/games/life3/trunk/Tupfile.lua index 77f33fcfc0..2f09dd924a 100644 --- a/programs/games/life3/trunk/Tupfile.lua +++ b/programs/games/life3/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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("life3.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "life3") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule("life3.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "life3") diff --git a/programs/games/lines/Tupfile.lua b/programs/games/lines/Tupfile.lua index 46290f6a74..d9ce43ad37 100644 --- a/programs/games/lines/Tupfile.lua +++ b/programs/games/lines/Tupfile.lua @@ -1,3 +1,7 @@ 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({"lines.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "lines") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"lines.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "lines") diff --git a/programs/games/mine/trunk/Tupfile.lua b/programs/games/mine/trunk/Tupfile.lua index b06ffc12a2..108d1099ee 100644 --- a/programs/games/mine/trunk/Tupfile.lua +++ b/programs/games/mine/trunk/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_CMM") ~= "" then return end -tup.rule("mine.c--", "c-- %f /meos" .. tup.getconfig("KPACK_CMD"), "mine") +tup.rule("mine.c--", "c-- %f /meos /opath=%o" .. tup.getconfig("KPACK_CMD"), "mine") diff --git a/programs/games/phenix/trunk/Tupfile.lua b/programs/games/phenix/trunk/Tupfile.lua index 8b050cfdb5..1e11389b58 100644 --- a/programs/games/phenix/trunk/Tupfile.lua +++ b/programs/games/phenix/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"phenix.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "phenix") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"phenix.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "phenix") diff --git a/programs/games/pipes/Tupfile.lua b/programs/games/pipes/Tupfile.lua index f26c2dad65..9effdabc35 100644 --- a/programs/games/pipes/Tupfile.lua +++ b/programs/games/pipes/Tupfile.lua @@ -1,3 +1,7 @@ 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({"pipes.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "pipes") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"pipes.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "pipes") diff --git a/programs/games/pong/trunk/Tupfile.lua b/programs/games/pong/trunk/Tupfile.lua index 64e2bd098a..8794b4eb3b 100644 --- a/programs/games/pong/trunk/Tupfile.lua +++ b/programs/games/pong/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"pong.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "pong") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"pong.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "pong") diff --git a/programs/games/sudoku/trunk/Tupfile.lua b/programs/games/sudoku/trunk/Tupfile.lua index 0503b8e84f..c3b00ab81a 100644 --- a/programs/games/sudoku/trunk/Tupfile.lua +++ b/programs/games/sudoku/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"sudoku.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "sudoku") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"sudoku.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "sudoku") diff --git a/programs/games/sw/trunk/Tupfile.lua b/programs/games/sw/trunk/Tupfile.lua index 33a4bb3ecc..4f1c00ec46 100644 --- a/programs/games/sw/trunk/Tupfile.lua +++ b/programs/games/sw/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"sw.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "sw") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"sw.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "sw") diff --git a/programs/games/tanks/trunk/Tupfile.lua b/programs/games/tanks/trunk/Tupfile.lua index f545f97b81..3eed88ca62 100644 --- a/programs/games/tanks/trunk/Tupfile.lua +++ b/programs/games/tanks/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"tanks.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "tanks") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"tanks.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tanks") diff --git a/programs/games/tetris/trunk/Tupfile.lua b/programs/games/tetris/trunk/Tupfile.lua index aa133e14c3..9c0a559142 100644 --- a/programs/games/tetris/trunk/Tupfile.lua +++ b/programs/games/tetris/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"tetris.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "tetris") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"tetris.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tetris") diff --git a/programs/hd_load/mtldr_install/Tupfile.lua b/programs/hd_load/mtldr_install/Tupfile.lua index 5ab661f616..1158e24500 100644 --- a/programs/hd_load/mtldr_install/Tupfile.lua +++ b/programs/hd_load/mtldr_install/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("mtldr_code/mtldr.asm", "fasm %f %o", "mtldr_for_installer") -tup.rule({"mtldr_install.asm", extra_inputs = {"mtldr_for_installer"}}, "fasm %f %o", "mtldr_install.exe") +tup.rule({"mtldr_install.asm", extra_inputs = {"mtldr_for_installer"}}, FASM .. " %f %o", "mtldr_install.exe") diff --git a/programs/media/img_transform/Tupfile.lua b/programs/media/img_transform/Tupfile.lua index 55d5813f68..14cc77b5cd 100644 --- a/programs/media/img_transform/Tupfile.lua +++ b/programs/media/img_transform/Tupfile.lua @@ -1,3 +1,7 @@ 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({"img_transform.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "img_transform") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"img_transform.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "img_transform") diff --git a/programs/media/midamp/trunk/Tupfile.lua b/programs/media/midamp/trunk/Tupfile.lua index f7e3678a1c..914f082ccd 100644 --- a/programs/media/midamp/trunk/Tupfile.lua +++ b/programs/media/midamp/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"midamp.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "midamp") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"midamp.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "midamp") diff --git a/programs/media/midiplay/trunk/Tupfile.lua b/programs/media/midiplay/trunk/Tupfile.lua index 4e52b584ec..a13c25b73d 100644 --- a/programs/media/midiplay/trunk/Tupfile.lua +++ b/programs/media/midiplay/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"midiplay.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "midiplay") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"midiplay.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "midiplay") diff --git a/programs/media/piano/Tupfile.lua b/programs/media/piano/Tupfile.lua index e4197ed6d1..5db28a1ecd 100644 --- a/programs/media/piano/Tupfile.lua +++ b/programs/media/piano/Tupfile.lua @@ -1,3 +1,7 @@ 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({"piano.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "piano") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"piano.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "piano") diff --git a/programs/media/pic4/trunk/Tupfile.lua b/programs/media/pic4/trunk/Tupfile.lua index 1225dc306d..29f0a0e41c 100644 --- a/programs/media/pic4/trunk/Tupfile.lua +++ b/programs/media/pic4/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"pic4.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "pic4") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"pic4.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "pic4") diff --git a/programs/media/scrshoot/Tupfile.lua b/programs/media/scrshoot/Tupfile.lua index 21ec4fe090..2faa669203 100644 --- a/programs/media/scrshoot/Tupfile.lua +++ b/programs/media/scrshoot/Tupfile.lua @@ -1,3 +1,7 @@ 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({"scrshoot.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "scrshoot") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"scrshoot.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "scrshoot") diff --git a/programs/media/voxel_editor/utilites/Tupfile.lua b/programs/media/voxel_editor/utilites/Tupfile.lua index a6311c43e1..82bb779a58 100644 --- a/programs/media/voxel_editor/utilites/Tupfile.lua +++ b/programs/media/voxel_editor/utilites/Tupfile.lua @@ -1,3 +1,7 @@ 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.foreach_rule({"vox_creator.asm", "vox_mover.asm", "vox_tgl.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "%B") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.foreach_rule({"vox_creator.asm", "vox_mover.asm", "vox_tgl.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B") diff --git a/programs/media/zsea/Tupfile.lua b/programs/media/zsea/Tupfile.lua index 4fe7315bb8..8462c7cbbe 100644 --- a/programs/media/zsea/Tupfile.lua +++ b/programs/media/zsea/Tupfile.lua @@ -1,3 +1,7 @@ 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({"zSea.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "zSea") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"zSea.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "zSea") diff --git a/programs/other/cnc_control/Tupfile.lua b/programs/other/cnc_control/Tupfile.lua index e839d0dc1a..63aa0fd10d 100644 --- a/programs/other/cnc_control/Tupfile.lua +++ b/programs/other/cnc_control/Tupfile.lua @@ -1,4 +1,8 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) -tup.rule({"cnc_control.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_control") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cnc_control.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_control") diff --git a/programs/other/cnc_editor/Tupfile.lua b/programs/other/cnc_editor/Tupfile.lua index 677d749f79..ee309783f6 100644 --- a/programs/other/cnc_editor/Tupfile.lua +++ b/programs/other/cnc_editor/Tupfile.lua @@ -1,3 +1,7 @@ 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({"cnc_editor.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_editor") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cnc_editor.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_editor") diff --git a/programs/other/ha/Tupfile.lua b/programs/other/ha/Tupfile.lua index 1ee60de54b..78a881cd90 100644 --- a/programs/other/ha/Tupfile.lua +++ b/programs/other/ha/Tupfile.lua @@ -1,4 +1,8 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) -tup.rule({"HA.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "HA") -tup.rule({"HACONFIG.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "HACONFIG") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"HA.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "HA") +tup.rule({"HACONFIG.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "HACONFIG") diff --git a/programs/other/outdated/bgitest/trunk/Tupfile.lua b/programs/other/outdated/bgitest/trunk/Tupfile.lua index 9706c4878d..2f35ee87c2 100644 --- a/programs/other/outdated/bgitest/trunk/Tupfile.lua +++ b/programs/other/outdated/bgitest/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"bgitest.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "bgitest") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"bgitest.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bgitest") diff --git a/programs/other/outdated/cdp/trunk/Tupfile.lua b/programs/other/outdated/cdp/trunk/Tupfile.lua index 9dc6ff2dbe..3e33cd5404 100644 --- a/programs/other/outdated/cdp/trunk/Tupfile.lua +++ b/programs/other/outdated/cdp/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"cdp.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cdp") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cdp.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cdp") diff --git a/programs/other/outdated/clip/trunk/Tupfile.lua b/programs/other/outdated/clip/trunk/Tupfile.lua index 90bdbe3fb9..1587b82ccd 100644 --- a/programs/other/outdated/clip/trunk/Tupfile.lua +++ b/programs/other/outdated/clip/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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.foreach_rule({"@clip.ASM", "cliptest.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "%B") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.foreach_rule({"@clip.ASM", "cliptest.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B") diff --git a/programs/other/outdated/copy2/trunk/Tupfile.lua b/programs/other/outdated/copy2/trunk/Tupfile.lua index 40f83c6c9a..dbc4754b03 100644 --- a/programs/other/outdated/copy2/trunk/Tupfile.lua +++ b/programs/other/outdated/copy2/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"copy2.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "copy2") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"copy2.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "copy2") diff --git a/programs/other/outdated/iconedit/trunk/Tupfile.lua b/programs/other/outdated/iconedit/trunk/Tupfile.lua index b47f148961..fc3ae40f3b 100644 --- a/programs/other/outdated/iconedit/trunk/Tupfile.lua +++ b/programs/other/outdated/iconedit/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"iconedit.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "iconedit") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"iconedit.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "iconedit") diff --git a/programs/other/outdated/mixer/trunk/Tupfile.lua b/programs/other/outdated/mixer/trunk/Tupfile.lua index 0c5966ed8c..139a6f34ce 100644 --- a/programs/other/outdated/mixer/trunk/Tupfile.lua +++ b/programs/other/outdated/mixer/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"mixer.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "mixer") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"mixer.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mixer") diff --git a/programs/other/outdated/mv/trunk/Tupfile.lua b/programs/other/outdated/mv/trunk/Tupfile.lua index 0689f3bbad..dd1e3fe8f2 100644 --- a/programs/other/outdated/mv/trunk/Tupfile.lua +++ b/programs/other/outdated/mv/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"mv.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "mv") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"mv.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mv") diff --git a/programs/other/outdated/param/trunk/Tupfile.lua b/programs/other/outdated/param/trunk/Tupfile.lua index 82dad175e2..57ffc84e9a 100644 --- a/programs/other/outdated/param/trunk/Tupfile.lua +++ b/programs/other/outdated/param/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"param.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "param") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"param.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "param") diff --git a/programs/other/outdated/rb/trunk/Tupfile.lua b/programs/other/outdated/rb/trunk/Tupfile.lua index f9ea04b34c..8824bb6907 100644 --- a/programs/other/outdated/rb/trunk/Tupfile.lua +++ b/programs/other/outdated/rb/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"rb.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "rb") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"rb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rb") diff --git a/programs/other/outdated/sb/trunk/Tupfile.lua b/programs/other/outdated/sb/trunk/Tupfile.lua index c21df1ed57..aad54be2f0 100644 --- a/programs/other/outdated/sb/trunk/Tupfile.lua +++ b/programs/other/outdated/sb/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"sb.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "sb") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"sb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "sb") diff --git a/programs/other/t_edit/Tupfile.lua b/programs/other/t_edit/Tupfile.lua index b35de72c2c..8c614cf53a 100644 --- a/programs/other/t_edit/Tupfile.lua +++ b/programs/other/t_edit/Tupfile.lua @@ -1,3 +1,7 @@ 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({"t_edit.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "t_edit") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"t_edit.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "t_edit") diff --git a/programs/system/MyKey/trunk/Tupfile.lua b/programs/system/MyKey/trunk/Tupfile.lua index c883f468b3..c14afc9d85 100644 --- a/programs/system/MyKey/trunk/Tupfile.lua +++ b/programs/system/MyKey/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"MyKey.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "MyKey") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"MyKey.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "MyKey") diff --git a/programs/system/RunOD/1/Tupfile.lua b/programs/system/RunOD/1/Tupfile.lua index 13f65d2261..fd15ce2746 100644 --- a/programs/system/RunOD/1/Tupfile.lua +++ b/programs/system/RunOD/1/Tupfile.lua @@ -1,16 +1,16 @@ if tup.getconfig('NO_JWASM') ~= "" or tup.getconfig("NO_GCC") ~= "" then return end if tup.getconfig("LANG") == "it" then - tup.definerule{command = "echo LANG_IT = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_IT = 1 > %o", outputs = {"lang.inc"}} elseif tup.getconfig("LANG") == "sp" then - tup.definerule{command = "echo LANG_SP = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_SP = 1 > %o", outputs = {"lang.inc"}} elseif tup.getconfig("LANG") == "ru" then - tup.definerule{command = "echo LANG_RU = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_RU = 1 > %o", outputs = {"lang.inc"}} elseif tup.getconfig("LANG") == "en" then - tup.definerule{command = "echo LANG_EN = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} else - tup.definerule{command = "echo LANG_EN = 1 > lang.inc", outputs = {"lang.inc"}} + tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} end -tup.rule({"RUN.asm", extra_inputs = {"lang.inc"}}, "jwasm -zt0 -coff -Fi lang.inc %f ", "RUN.o") -tup.rule("RUN.o", "kos32-ld -T LScript.x -o %o %f -L ../../../../contrib/sdk/lib -l KolibriOS && kos32-objcopy %o -O binary -j .all" .. tup.getconfig("KPACK_CMD"),"RUN") \ No newline at end of file +tup.rule({"RUN.asm", extra_inputs = {"lang.inc"}}, "jwasm " .. " -I" .. tup.getcwd() .. " -I" .. tup.getvariantdir() .. " -zt0 -coff -Fi lang.inc -Fo %o %f", "RUN.o") +tup.rule("RUN.o", "kos32-ld -T LScript.x -o %o %f -L ../../../../contrib/sdk/lib -l KolibriOS && kos32-objcopy %o -O binary -j .all" .. tup.getconfig("KPACK_CMD"),"RUN") diff --git a/programs/system/RunOD/Tupfile.lua b/programs/system/RunOD/Tupfile.lua index d1326b344f..3690e1c00b 100644 --- a/programs/system/RunOD/Tupfile.lua +++ b/programs/system/RunOD/Tupfile.lua @@ -1,3 +1,7 @@ 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({"RunOD.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "RunOD") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"RunOD.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "RunOD") diff --git a/programs/system/board/trunk/Tupfile.lua b/programs/system/board/trunk/Tupfile.lua index e9f286fdaf..3180448c1a 100644 --- a/programs/system/board/trunk/Tupfile.lua +++ b/programs/system/board/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"board.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "board") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"board.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "board") diff --git a/programs/system/calendar/trunk/Tupfile.lua b/programs/system/calendar/trunk/Tupfile.lua index fe888ee258..aa578b75c2 100644 --- a/programs/system/calendar/trunk/Tupfile.lua +++ b/programs/system/calendar/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"calendar.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "calendar") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"calendar.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "calendar") diff --git a/programs/system/cpu/trunk/Tupfile.lua b/programs/system/cpu/trunk/Tupfile.lua index 8c8a4fd4c1..af94fc89c8 100644 --- a/programs/system/cpu/trunk/Tupfile.lua +++ b/programs/system/cpu/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"cpu.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cpu") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"cpu.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cpu") diff --git a/programs/system/docpack/trunk/Tupfile.lua b/programs/system/docpack/trunk/Tupfile.lua index f58643b2e0..39c83dad33 100644 --- a/programs/system/docpack/trunk/Tupfile.lua +++ b/programs/system/docpack/trunk/Tupfile.lua @@ -1,5 +1,9 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("BUILD_TYPE") == "" then return end -deps = tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +deps = tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) DOCDIR = "../../../../data/" .. tup.getconfig("BUILD_TYPE") .. "/docs/" if tup.getconfig("TUP_PLATFORM") == "win32" then env_prefix = "set DOCDIR=$(DOCDIR)&&"; cp_cmd = "copy %f %o" @@ -17,4 +21,4 @@ tup.append_table(deps, tup.append_table(deps, tup.rule("../../../../kernel/trunk/docs/stack.txt", cp_cmd, "STACK.TXT") ) -tup.rule({"docpack.asm", extra_inputs = deps}, env_prefix .. "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "docpack") +tup.rule({"docpack.asm", extra_inputs = deps}, env_prefix .. FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "docpack") diff --git a/programs/system/end/light/Tupfile.lua b/programs/system/end/light/Tupfile.lua index ec365610d4..1ec0b6d4c6 100644 --- a/programs/system/end/light/Tupfile.lua +++ b/programs/system/end/light/Tupfile.lua @@ -1,3 +1,7 @@ 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({"end.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "end") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"end.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "end") diff --git a/programs/system/format/Tupfile.lua b/programs/system/format/Tupfile.lua index c4c7843e5a..30ccf9051f 100644 --- a/programs/system/format/Tupfile.lua +++ b/programs/system/format/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) -tup.rule({"format.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "FORMAT") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"format.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "FORMAT") diff --git a/programs/system/hdd_info/trunk/Tupfile.lua b/programs/system/hdd_info/trunk/Tupfile.lua index 252fbb19c0..1091719cd5 100644 --- a/programs/system/hdd_info/trunk/Tupfile.lua +++ b/programs/system/hdd_info/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"hdd_info.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "hdd_info") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"hdd_info.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "hdd_info") diff --git a/programs/system/icon/trunk/Tupfile.lua b/programs/system/icon/trunk/Tupfile.lua index c47a3460c9..67777ce6c0 100644 --- a/programs/system/icon/trunk/Tupfile.lua +++ b/programs/system/icon/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"icon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "icon") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"icon.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "icon") diff --git a/programs/system/icon_new/Tupfile.lua b/programs/system/icon_new/Tupfile.lua index c47a3460c9..1e4a24a273 100644 --- a/programs/system/icon_new/Tupfile.lua +++ b/programs/system/icon_new/Tupfile.lua @@ -1,3 +1,7 @@ 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({"icon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "icon") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"icon.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "icon") diff --git a/programs/system/keybi/Tupfile.lua b/programs/system/keybi/Tupfile.lua index bad5d4fbb5..d56b40b369 100644 --- a/programs/system/keybi/Tupfile.lua +++ b/programs/system/keybi/Tupfile.lua @@ -1,3 +1,7 @@ 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({"keybi.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "keybi") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"keybi.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "keybi") diff --git a/programs/system/menu/trunk/Tupfile.lua b/programs/system/menu/trunk/Tupfile.lua index b282f7cd34..83be720fdf 100644 --- a/programs/system/menu/trunk/Tupfile.lua +++ b/programs/system/menu/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"menu.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "menu") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"menu.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "menu") diff --git a/programs/system/mousemul/trunk/Tupfile.lua b/programs/system/mousemul/trunk/Tupfile.lua index 7bf515f510..f9759453a3 100644 --- a/programs/system/mousemul/trunk/Tupfile.lua +++ b/programs/system/mousemul/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"mousemul.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "mousemul") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"mousemul.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mousemul") diff --git a/programs/system/open/Tupfile.lua b/programs/system/open/Tupfile.lua index c6389cd8ed..e3f45df008 100644 --- a/programs/system/open/Tupfile.lua +++ b/programs/system/open/Tupfile.lua @@ -1,3 +1,7 @@ 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({"open.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "open") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"open.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "open") diff --git a/programs/system/rdsave/trunk/Tupfile.lua b/programs/system/rdsave/trunk/Tupfile.lua index 12d5173042..f4fe54ae68 100644 --- a/programs/system/rdsave/trunk/Tupfile.lua +++ b/programs/system/rdsave/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"rdsave.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "rdsave") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"rdsave.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rdsave") diff --git a/programs/system/refrscrn/Tupfile.lua b/programs/system/refrscrn/Tupfile.lua index 1079d45e96..c540ef3958 100644 --- a/programs/system/refrscrn/Tupfile.lua +++ b/programs/system/refrscrn/Tupfile.lua @@ -1,3 +1,7 @@ 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({"refrscrn.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "refrscrn") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"refrscrn.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "refrscrn") diff --git a/programs/system/run/trunk/Tupfile.lua b/programs/system/run/trunk/Tupfile.lua index ec2bf29dd5..34daf93368 100644 --- a/programs/system/run/trunk/Tupfile.lua +++ b/programs/system/run/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"run.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "run") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"run.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "run") diff --git a/programs/system/shell/Tupfile.lua b/programs/system/shell/Tupfile.lua index 00d94fda5b..4b309cbbac 100644 --- a/programs/system/shell/Tupfile.lua +++ b/programs/system/shell/Tupfile.lua @@ -2,6 +2,7 @@ if tup.getconfig("NO_TCC") ~= "" then return end HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_tcc.lua") +CFLAGS += " -I" .. tup.getvariantdir() if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" diff --git a/programs/system/skincfg/trunk/Tupfile.lua b/programs/system/skincfg/trunk/Tupfile.lua index c19417b512..5461643cd3 100644 --- a/programs/system/skincfg/trunk/Tupfile.lua +++ b/programs/system/skincfg/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"skincfg.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "skincfg") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"skincfg.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "skincfg") diff --git a/programs/system/taskbar/trunk/Tupfile.lua b/programs/system/taskbar/trunk/Tupfile.lua index cedf830391..156f820e01 100644 --- a/programs/system/taskbar/trunk/Tupfile.lua +++ b/programs/system/taskbar/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"TASKBAR.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "TASKBAR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"TASKBAR.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "TASKBAR") diff --git a/programs/testing/cpuid/trunk/Tupfile.lua b/programs/testing/cpuid/trunk/Tupfile.lua index 6ba27165a0..4561c23c2d 100644 --- a/programs/testing/cpuid/trunk/Tupfile.lua +++ b/programs/testing/cpuid/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"CPUID.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o -m70000" .. tup.getconfig("KPACK_CMD"), "CPUID") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"CPUID.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -m70000" .. tup.getconfig("KPACK_CMD"), "CPUID") diff --git a/programs/testing/disptest/trunk/Tupfile.lua b/programs/testing/disptest/trunk/Tupfile.lua index a5e379a122..8d7ae98df0 100644 --- a/programs/testing/disptest/trunk/Tupfile.lua +++ b/programs/testing/disptest/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"disptest.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "disptest") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"disptest.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "disptest") diff --git a/programs/testing/fspeed/Tupfile.lua b/programs/testing/fspeed/Tupfile.lua index 96eba87810..0822a71ab0 100644 --- a/programs/testing/fspeed/Tupfile.lua +++ b/programs/testing/fspeed/Tupfile.lua @@ -1,3 +1,7 @@ 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({"fspeed.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "fspeed") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"fspeed.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "fspeed") diff --git a/programs/testing/kbd/trunk/Tupfile.lua b/programs/testing/kbd/trunk/Tupfile.lua index 08bef6e27f..d1e67bf9a7 100644 --- a/programs/testing/kbd/trunk/Tupfile.lua +++ b/programs/testing/kbd/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"kbd.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "kbd") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"kbd.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kbd") diff --git a/programs/testing/mgb/trunk/Tupfile.lua b/programs/testing/mgb/trunk/Tupfile.lua index b9d1c002fa..12521973e4 100644 --- a/programs/testing/mgb/trunk/Tupfile.lua +++ b/programs/testing/mgb/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"mgb.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "mgb") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"mgb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mgb") diff --git a/programs/testing/pcidev/trunk/Tupfile.lua b/programs/testing/pcidev/trunk/Tupfile.lua index 6bcac688ad..a8e5a32f1f 100644 --- a/programs/testing/pcidev/trunk/Tupfile.lua +++ b/programs/testing/pcidev/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"PCIDEV.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "PCIDEV") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"PCIDEV.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "PCIDEV") diff --git a/programs/testing/protection/trunk/Tupfile.lua b/programs/testing/protection/trunk/Tupfile.lua index e9d5fb35e5..fbdce36dbc 100644 --- a/programs/testing/protection/trunk/Tupfile.lua +++ b/programs/testing/protection/trunk/Tupfile.lua @@ -1,3 +1,7 @@ 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({"test.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "test") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule({"test.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "test") diff --git a/programs/use_gcc.lua b/programs/use_gcc.lua index cdc802c784..0f054f9667 100644 --- a/programs/use_gcc.lua +++ b/programs/use_gcc.lua @@ -11,7 +11,7 @@ CFLAGS = CFLAGS_OPTIMIZE_SIZE CFLAGS_c = "" -- extra flags for *.c CFLAGS_cpp = " -fno-rtti" -- extra flags for *.cpp -LDFLAGS = "-static -nostdlib -n --file-alignment=16 --section-alignment=16" +LDFLAGS = "-static -nostdlib -n --file-alignment=16 --section-alignment=16 -L" .. tup.getvariantdir() .. " " INCLUDES = "" LIBS = "" LIBDEPS = {} diff --git a/programs/use_menuetlibc.lua b/programs/use_menuetlibc.lua index dcb52a0c08..5df28256ee 100644 --- a/programs/use_menuetlibc.lua +++ b/programs/use_menuetlibc.lua @@ -1,12 +1,13 @@ -MELIBC = tup.getcwd() .. "/develop/libraries/menuetlibc" +MELIBC_CWD = tup.getcwd() .. "/develop/libraries/menuetlibc" +MELIBC_VAR = tup.getvariantdir() .. "/develop/libraries/menuetlibc" -INCLUDES = INCLUDES .. " -I" .. MELIBC .. "/include" -STARTUP = MELIBC .. "/stub/crt0.o" +INCLUDES = INCLUDES .. " -I" .. MELIBC_CWD .. "/include" +STARTUP = MELIBC_VAR .. "/stub/crt0.o" CFLAGS_c = " -fgnu89-inline" -LDFLAGS = LDFLAGS .. string.gsub(" -T$/include/scripts/menuetos_app_v01.ld -L$/lib", "%$", MELIBC) -tup.append_table(LIBDEPS, {MELIBC .. "/", MELIBC .. "/", MELIBC .. "/"}) -LIBS = LIBS .. " -lcpp -lm -lc" +LDFLAGS = LDFLAGS .. " -T" .. MELIBC_CWD .. "/include/scripts/menuetos_app_v01.ld -L" .. MELIBC_VAR .. "/lib" +tup.append_table(LIBDEPS, {MELIBC_VAR .. "/", MELIBC_VAR .. "/", MELIBC_VAR .. "/"}) +LIBS = LIBS .. " -L" .. tup.getvariantdir() .. " -lcpp -lm -lc" function use_dynamic_stack() - STARTUP = MELIBC .. "/stub/crt0_dynstack.o" + STARTUP = MELIBC_VAR .. "/stub/crt0_dynstack.o" end diff --git a/programs/use_msvc.lua b/programs/use_msvc.lua index b07f75c99b..b909717b2a 100644 --- a/programs/use_msvc.lua +++ b/programs/use_msvc.lua @@ -20,8 +20,8 @@ function link_msvc(input, output) if not output then input,output = OBJS,input end if type(output) ~= "string" then error("output for link_msvc should be simple string") end - local exename = output .. ".exe" - local mapname = output .. ".map" + local exename = tup.getvariantdir() .. "/" .. output .. ".exe" + local mapname = tup.getvariantdir() .. "/" .. output .. ".map" tup.rule(input, "link.exe " .. LDFLAGS .. " /out:%o /Map:" .. mapname .. " %f", {exename, extra_outputs = {mapname}}) tup.rule(exename, env_prefix .. "fasm " .. THISDIR .. "/../data/common/doexe2.asm %o " .. tup.getconfig("KPACK_CMD"), output) diff --git a/programs/use_newlib.lua b/programs/use_newlib.lua index b48b7fcaab..b21ea14606 100644 --- a/programs/use_newlib.lua +++ b/programs/use_newlib.lua @@ -1,5 +1,6 @@ NEWLIB_BASE = tup.getcwd() .. "/../contrib/sdk/sources/newlib" -NEWLIB_LIB = tup.getcwd() .. "/../contrib/sdk/lib" +SDK_CWD = tup.getcwd() .. "/../contrib/sdk/lib" +SDK_VAR = tup.getvariantdir() .. "/../contrib/sdk/lib" TOOLCHAIN_LIBPATH = tup.getconfig("TOOLCHAIN_LIBPATH") -- if not given explicitly in config, try to guess @@ -10,7 +11,7 @@ if TOOLCHAIN_LIBPATH == "" then end end -INCLUDES = INCLUDES .. " -I" .. NEWLIB_BASE .. "/libc/include" -LDFLAGS = LDFLAGS .. " -T$(NEWLIB_BASE)/app-dynamic.lds -L$(NEWLIB_LIB) --image-base 0" -tup.append_table(LIBDEPS, {NEWLIB_LIB .. "/"}) -LIBS = LIBS .. "-lgcc -lc.dll" +INCLUDES += " -I$(NEWLIB_BASE)/libc/include" +LDFLAGS += " -T$(NEWLIB_BASE)/app-dynamic.lds -L$(SDK_CWD) -L$(SDK_VAR) --image-base 0" +tup.append_table(LIBDEPS, {SDK_CWD .. "/"}) +LIBS += "-lgcc -lc.dll" diff --git a/programs/use_sdl.lua b/programs/use_sdl.lua index 796dc4d24c..90754d8f8c 100644 --- a/programs/use_sdl.lua +++ b/programs/use_sdl.lua @@ -1,5 +1,5 @@ SDL_INCLUDE = tup.getcwd() .. "/../contrib/sdk/sources/SDL-1.2.2/include" -SDL_LIB = tup.getcwd() .. "/../contrib/sdk/lib" +SDL_LIB = tup.getvariantdir() .. "/../contrib/sdk/lib" tup.include("use_sound.lua") diff --git a/programs/use_sdl_newlib.lua b/programs/use_sdl_newlib.lua index fde075b52d..b16784d836 100755 --- a/programs/use_sdl_newlib.lua +++ b/programs/use_sdl_newlib.lua @@ -1,5 +1,5 @@ SDL_INCLUDE = tup.getcwd() .. "/../contrib/sdk/sources/SDL-1.2.2_newlib/include" -SDL_LIB = tup.getcwd() .. "/../contrib/sdk/lib" +SDL_LIB = tup.getvariantdir() .. "/../contrib/sdk/lib" tup.include("use_sound.lua") diff --git a/programs/use_sound.lua b/programs/use_sound.lua index f0c4104eae..d0a019c0e2 100644 --- a/programs/use_sound.lua +++ b/programs/use_sound.lua @@ -1,5 +1,6 @@ -SOUND = tup.getcwd() .. "/develop/sdk/trunk/sound" +SOUND_CWD = tup.getcwd() .. "/develop/sdk/trunk/sound" +SOUND_VAR = tup.getvariantdir() .. "/develop/sdk/trunk/sound" -INCLUDES = INCLUDES .. " -I" .. SOUND .. "/include" -table.insert(LIBDEPS, SOUND .. "/src/sound.lib") -LIBS = SOUND .. "/src/sound.lib " .. LIBS +INCLUDES = INCLUDES .. " -I" .. SOUND_CWD .. "/include" +table.insert(LIBDEPS, SOUND_VAR .. "/src/sound.lib") +LIBS = SOUND_VAR .. "/src/sound.lib " .. LIBS diff --git a/programs/use_tinygl.lua b/programs/use_tinygl.lua index 3542e18abb..698d729a0f 100644 --- a/programs/use_tinygl.lua +++ b/programs/use_tinygl.lua @@ -1,5 +1,6 @@ -TINYGL = tup.getcwd() .. "/develop/libraries/TinyGL" +TINYGL_CWD = tup.getcwd() .. "/develop/libraries/TinyGL" +TINYGL_VAR = tup.getvariantdir() .. "/develop/libraries/TinyGL" -INCLUDES = INCLUDES .. " -I" .. TINYGL .. "/include" -table.insert(LIBDEPS, TINYGL .. "/<>") -LIBS = TINYGL .. "/lib/libTinyGL.a " .. LIBS +INCLUDES = INCLUDES .. " -I" .. TINYGL_CWD .. "/include" +table.insert(LIBDEPS, TINYGL_VAR .. "/<>") +LIBS = TINYGL_VAR .. "/lib/libTinyGL.a " .. LIBS diff --git a/skins/ConLenov/8Metro/Tupfile.lua b/skins/ConLenov/8Metro/Tupfile.lua index 1de5d32bcc..0a7b6dd2ae 100644 --- a/skins/ConLenov/8Metro/Tupfile.lua +++ b/skins/ConLenov/8Metro/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"8Metro.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "8Metro.skn") +tup.rule({"8Metro.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "8Metro.skn") diff --git a/skins/ConLenov/Aigul/Tupfile.lua b/skins/ConLenov/Aigul/Tupfile.lua index e1b197576c..2be37bd15c 100644 --- a/skins/ConLenov/Aigul/Tupfile.lua +++ b/skins/ConLenov/Aigul/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Aigul.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Aigul.skn") \ No newline at end of file +tup.rule({"Aigul.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Aigul.skn") diff --git a/skins/ConLenov/Arina/Tupfile.lua b/skins/ConLenov/Arina/Tupfile.lua index 60ad192f2a..3cb4aa08d8 100644 --- a/skins/ConLenov/Arina/Tupfile.lua +++ b/skins/ConLenov/Arina/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Arina.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Arina.skn") +tup.rule({"Arina.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Arina.skn") diff --git a/skins/ConLenov/FlowerMoon/Tupfile.lua b/skins/ConLenov/FlowerMoon/Tupfile.lua index 51eb50664b..07054c23be 100644 --- a/skins/ConLenov/FlowerMoon/Tupfile.lua +++ b/skins/ConLenov/FlowerMoon/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"FlowerMoon.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "FlowerMoon.skn") +tup.rule({"FlowerMoon.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "FlowerMoon.skn") diff --git a/skins/ConLenov/GX/GX_Red/Tupfile.lua b/skins/ConLenov/GX/GX_Red/Tupfile.lua index df9e7c79d8..ade9cdd9b7 100644 --- a/skins/ConLenov/GX/GX_Red/Tupfile.lua +++ b/skins/ConLenov/GX/GX_Red/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"GX_Red.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "GX_Red.skn") +tup.rule({"GX_Red.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "GX_Red.skn") diff --git a/skins/ConLenov/GX/GX_Violet/Tupfile.lua b/skins/ConLenov/GX/GX_Violet/Tupfile.lua index 21c9755a8a..01352890c4 100644 --- a/skins/ConLenov/GX/GX_Violet/Tupfile.lua +++ b/skins/ConLenov/GX/GX_Violet/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"GX_Violet.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "GX_Violet.skn") +tup.rule({"GX_Violet.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "GX_Violet.skn") diff --git a/skins/ConLenov/Guzel/Tupfile.lua b/skins/ConLenov/Guzel/Tupfile.lua index 1ff0bf626b..2b882e246a 100644 --- a/skins/ConLenov/Guzel/Tupfile.lua +++ b/skins/ConLenov/Guzel/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Guzel.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Guzel.skn") \ No newline at end of file +tup.rule({"Guzel.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Guzel.skn") diff --git a/skins/ConLenov/Guzel_magic/Tupfile.lua b/skins/ConLenov/Guzel_magic/Tupfile.lua index 8be8d889f5..532a521963 100644 --- a/skins/ConLenov/Guzel_magic/Tupfile.lua +++ b/skins/ConLenov/Guzel_magic/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Guzel_magic.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Guzel_magic.skn") \ No newline at end of file +tup.rule({"Guzel_magic.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Guzel_magic.skn") diff --git a/skins/ConLenov/HotFox/Tupfile.lua b/skins/ConLenov/HotFox/Tupfile.lua index 5f5d6de885..cc2ae40f3e 100644 --- a/skins/ConLenov/HotFox/Tupfile.lua +++ b/skins/ConLenov/HotFox/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"HotFox.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "HotFox.skn") +tup.rule({"HotFox.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "HotFox.skn") diff --git a/skins/ConLenov/LucidChocolate/Tupfile.lua b/skins/ConLenov/LucidChocolate/Tupfile.lua index a8961d12bd..6890955cfd 100644 --- a/skins/ConLenov/LucidChocolate/Tupfile.lua +++ b/skins/ConLenov/LucidChocolate/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"LucidChocolate.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "LucidChocolate.skn") +tup.rule({"LucidChocolate.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "LucidChocolate.skn") diff --git a/skins/ConLenov/LucidCream/Tupfile.lua b/skins/ConLenov/LucidCream/Tupfile.lua index 90ae403639..75ca8ba73c 100644 --- a/skins/ConLenov/LucidCream/Tupfile.lua +++ b/skins/ConLenov/LucidCream/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"LucidCream.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "LucidCream.skn") +tup.rule({"LucidCream.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "LucidCream.skn") diff --git a/skins/ConLenov/Win10/Tupfile.lua b/skins/ConLenov/Win10/Tupfile.lua index 76faff0f45..c12161a949 100644 --- a/skins/ConLenov/Win10/Tupfile.lua +++ b/skins/ConLenov/Win10/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("Win10.dtp.asm", 'fasm "%f" "%o"', "Win10.dtp") -tup.rule({"Win10.asm", extra_inputs = {"Win10.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Win10.skn") +tup.rule({"Win10.asm", extra_inputs = {"Win10.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Win10.skn") diff --git a/skins/ConLenov/Yaru-dark/Tupfile.lua b/skins/ConLenov/Yaru-dark/Tupfile.lua index cb029ba6e8..c0e56cfb00 100644 --- a/skins/ConLenov/Yaru-dark/Tupfile.lua +++ b/skins/ConLenov/Yaru-dark/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Yaru-dark.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru-dark.skn") +tup.rule({"Yaru-dark.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru-dark.skn") diff --git a/skins/ConLenov/Yaru-light/Tupfile.lua b/skins/ConLenov/Yaru-light/Tupfile.lua index 28c3438e43..535a6700a6 100644 --- a/skins/ConLenov/Yaru-light/Tupfile.lua +++ b/skins/ConLenov/Yaru-light/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Yaru-light.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru-light.skn") +tup.rule({"Yaru-light.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru-light.skn") diff --git a/skins/ConLenov/Yaru/Tupfile.lua b/skins/ConLenov/Yaru/Tupfile.lua index 4045c2f496..112bd96a66 100644 --- a/skins/ConLenov/Yaru/Tupfile.lua +++ b/skins/ConLenov/Yaru/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"Yaru.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru.skn") +tup.rule({"Yaru.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru.skn") diff --git a/skins/ConLenov/mntech/Tupfile.lua b/skins/ConLenov/mntech/Tupfile.lua index c29bcee846..6da2da309d 100644 --- a/skins/ConLenov/mntech/Tupfile.lua +++ b/skins/ConLenov/mntech/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"mntech.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mntech.skn") +tup.rule({"mntech.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mntech.skn") diff --git a/skins/Leency/Florence/Tupfile.lua b/skins/Leency/Florence/Tupfile.lua index 28fde69939..4ee4fcfdf1 100644 --- a/skins/Leency/Florence/Tupfile.lua +++ b/skins/Leency/Florence/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("col.dtp.asm", 'fasm "%f" "%o"', "col.dtp") -tup.rule({"florence.asm", extra_inputs = {"col.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Florence.skn") +tup.rule({"florence.asm", extra_inputs = {"col.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Florence.skn") diff --git a/skins/Leency/Oasis/Tupfile.lua b/skins/Leency/Oasis/Tupfile.lua index 74a887f971..9b8cf40850 100644 --- a/skins/Leency/Oasis/Tupfile.lua +++ b/skins/Leency/Oasis/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"default.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Oasis.skn") +tup.rule({"default.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Oasis.skn") diff --git a/skins/Leency/Shkvorka/Tupfile.lua b/skins/Leency/Shkvorka/Tupfile.lua index 5fbcabf215..737dc494fe 100644 --- a/skins/Leency/Shkvorka/Tupfile.lua +++ b/skins/Leency/Shkvorka/Tupfile.lua @@ -1,4 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("colors.dtp.asm", 'fasm "%f" "%o"', "colors.dtp") -tup.rule({"default.asm", extra_inputs = {"colors.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Shkvorka.skn") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) +tup.rule("colors.dtp.asm", 'fasm "%f" "%o"', "colors.dtp") +tup.rule({"default.asm", extra_inputs = {"colors.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Shkvorka.skn") diff --git a/skins/Leency/Vaporwave/Tupfile.lua b/skins/Leency/Vaporwave/Tupfile.lua index 90928adb69..fcbc0bad7e 100644 --- a/skins/Leency/Vaporwave/Tupfile.lua +++ b/skins/Leency/Vaporwave/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("dtp.asm", 'fasm "%f" "%o"', "dtp.dtp") -tup.rule({"default.asm", extra_inputs = {"dtp.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "vaporwave.skn") +tup.rule({"default.asm", extra_inputs = {"dtp.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "vaporwave.skn") diff --git a/skins/_old/mage-scroll/Tupfile.lua b/skins/_old/mage-scroll/Tupfile.lua index 58bf53e602..cd442fa966 100644 --- a/skins/_old/mage-scroll/Tupfile.lua +++ b/skins/_old/mage-scroll/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("colour.asm", 'fasm "%f" "%o"', "colour.dtp") -tup.rule({"default.asm", extra_inputs = {"colour.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mage-scroll.skn") +tup.rule({"default.asm", extra_inputs = {"colour.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mage-scroll.skn") diff --git a/skins/dunkaist/mursky/Tupfile.lua b/skins/dunkaist/mursky/Tupfile.lua index 1f370adb4d..3705754c71 100644 --- a/skins/dunkaist/mursky/Tupfile.lua +++ b/skins/dunkaist/mursky/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("dtp.asm", 'fasm "%f" "%o" ', "%B") -tup.rule({"mursky.asm", extra_inputs = {"dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mursky.skn") +tup.rule({"mursky.asm", extra_inputs = {"dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mursky.skn") diff --git a/skins/dunkaist/testtest/Tupfile.lua b/skins/dunkaist/testtest/Tupfile.lua index e218b9a51d..cbb2f64928 100644 --- a/skins/dunkaist/testtest/Tupfile.lua +++ b/skins/dunkaist/testtest/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("dtp.asm", 'fasm "%f" "%o"', "%B") -tup.rule({"testtest.asm", extra_inputs = {"dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "testtest.skn") +tup.rule({"testtest.asm", extra_inputs = {"dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "testtest.skn") diff --git a/skins/maxcodehack/blacky/Tupfile.lua b/skins/maxcodehack/blacky/Tupfile.lua index 6a3142c4a6..488a59e379 100755 --- a/skins/maxcodehack/blacky/Tupfile.lua +++ b/skins/maxcodehack/blacky/Tupfile.lua @@ -1,4 +1,8 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") -tup.rule({"default.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Blacky.skn") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + +tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") +tup.rule({"default.asm", extra_inputs = {"default.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Blacky.skn") diff --git a/skins/misc/loggy/Tupfile.lua b/skins/misc/loggy/Tupfile.lua index 6ee0996823..659d097e4d 100644 --- a/skins/misc/loggy/Tupfile.lua +++ b/skins/misc/loggy/Tupfile.lua @@ -1,3 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_fasm.lua") +add_include(tup.getvariantdir()) + tup.rule("dtp.asm", 'fasm "%f" "%o"', "dtp.dtp") -tup.rule({"default.asm", extra_inputs = {"dtp.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "loggy.skn") +tup.rule({"default.asm", extra_inputs = {"dtp.dtp"}}, FASM .. ' "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "loggy.skn")