Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7126 → Rev 7127

/programs/system/launch/trunk/Tupfile.lua
1,2 → 1,6
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("launch.asm", "fasm %f %o -dlang=" .. tup.getconfig("LANG") .. tup.getconfig("KPACK_CMD"), "launch")
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
 
add_include(HELPERDIR .. "/develop/libraries/libs-dev/libio")
tup.rule("launch.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "launch")
/programs/system/launch/trunk/launch.asm
43,10 → 43,10
define DEBUG_DEFAULT 0
define BUFF_SIZE 1024
 
include '../../../proc32.inc'
include '../../../macros.inc'
include '../../../develop/libraries/libs-dev/libio/libio.inc'
include '../../../dll.inc'
include 'proc32.inc'
include 'macros.inc'
include 'libio.inc'
include 'dll.inc'
 
purge mov
 
/programs/use_fasm.lua
0,0 → 1,16
INCLUDES = ""
FASM_DEFAULT = "fasm"
 
function add_include(dir)
if INCLUDES == ""
then INCLUDES = dir
else INCLUDES = INCLUDES .. ";" .. dir
end
if tup.getconfig("TUP_PLATFORM") == "win32"
then env_prefix = "set INCLUDE='$(INCLUDES)'&&"
else env_prefix = "INCLUDE='$(INCLUDES)' "
end
FASM = env_prefix .. FASM_DEFAULT
end
 
add_include(tup.getcwd())