From 8f444289e045386c53e136eb236bdff624f310b4 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Tue, 21 May 2024 14:55:01 +0000 Subject: [PATCH] Trigger tup-0.8 autobuild (minor Tupfile.lua changes) git-svn-id: svn://kolibrios.org@10043 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Tupfile.lua | 2 +- programs/fs/minizip/Tupfile.lua | 2 +- programs/games/fridge/Tupfile.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmm/eolite/Tupfile.lua b/programs/cmm/eolite/Tupfile.lua index dd9f2f6c8..c186c6753 100644 --- a/programs/cmm/eolite/Tupfile.lua +++ b/programs/cmm/eolite/Tupfile.lua @@ -9,7 +9,7 @@ else C_LANG = "LANG_ENG" -- this includes default case without config end LFLAGS = LFLAGS .. " -stack=20480" -LIBS = LIBS .. " ../../develop/ktcc/trunk/bin/lib/tiny.o -nostdlib -lbox_lib -lini -limg" +LIBS += " ../../develop/ktcc/trunk/bin/lib/tiny.o -nostdlib -lbox_lib -lini -limg" tup.rule("Eolite.c", "c-- -coff /D=" .. C_LANG .. " /OPATH=%o %f", "%B.obj") tup.rule("Eolite.obj", "objconv -felf32 %f %o", "%B.o") diff --git a/programs/fs/minizip/Tupfile.lua b/programs/fs/minizip/Tupfile.lua index bd2c0cef1..539058a30 100644 --- a/programs/fs/minizip/Tupfile.lua +++ b/programs/fs/minizip/Tupfile.lua @@ -11,7 +11,7 @@ CFLAGS = CFLAGS .. " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -Dunix LDFLAGS = LDFLAGS .. " --subsystem console -L../../../contrib/sdk/sources/zlib" table.insert(LIBDEPS,"../../../contrib/sdk/lib/") -LIBS = LIBS .. " -lz.dll" +LIBS += " -lz.dll" -- Compile -- compile_gcc{ diff --git a/programs/games/fridge/Tupfile.lua b/programs/games/fridge/Tupfile.lua index 4a4796011..47589cb92 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 .. " " .. tup.getvariantdir() .. "/../../../contrib/C_Layer/OBJ/loadlibimg.o " +LIBS += " " .. tup.getvariantdir() .. "/../../../contrib/C_Layer/OBJ/loadlibimg.o " -- Subsystem native LDFLAGS = LDFLAGS .. " --subsystem native"