forked from KolibriOS/kolibrios
Trigger tup-0.8 autobuild (minor Tupfile.lua changes)
git-svn-id: svn://kolibrios.org@10043 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
e9e08c56b6
commit
8f444289e0
@ -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")
|
||||
|
@ -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/<libz.dll.a>")
|
||||
LIBS = LIBS .. " -lz.dll"
|
||||
LIBS += " -lz.dll"
|
||||
|
||||
-- Compile --
|
||||
compile_gcc{
|
||||
|
@ -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/<C_Layer>")
|
||||
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"
|
||||
|
Loading…
Reference in New Issue
Block a user