keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fix autobuild.

Browse Source 
git-svn-id: svn://kolibrios.org@8724 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2021-05-22 19:09:11 +00:00
parent 64e1e52eba
commit bb845a71ca
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/disk/Tupfile.lua
View File

@ -1,3 +1,4 @@
if tup.getconfig("NO_FASM") ~= "" then return end if tup.getconfig("NO_FASM") ~= "" then return end
ROOT = "../.." ROOT = "../.."
tup.rule("tmpdisk.asm", "fasm %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B.sys") tup.include(ROOT .. "/programs/use_fasm.lua")
tup.rule("tmpdisk.asm", "fasm %f %o " .. PESTRIP_CMD .. tup.getconfig("KPACK_CMD"), "%B.sys")

4
programs/develop/libraries/console/examples/Tupfile.lua
View File

@ -1,5 +1,5 @@
if tup.getconfig("NO_FASM") ~= "" then return end if tup.getconfig("NO_FASM") ~= "" then return end
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_fasm.lua")
ROOT = "../../../../.." ROOT = "../../../../.."
tup.foreach_rule("*.asm", FASM .. " %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B") tup.include(HELPERDIR .. "/use_fasm.lua")
tup.foreach_rule("*.asm", FASM .. " %f %o " .. PESTRIP_CMD .. tup.getconfig("KPACK_CMD"), "%B")

2
programs/develop/libraries/dll/dll.asm
View File

@ -91,7 +91,7 @@ APP_STARTUP_THUNK:
; WARNING! This code must be after app initialization thunk! ; WARNING! This code must be after app initialization thunk!
include '../../dll.inc' include '../../../dll.inc'
align 4 align 4
;dd 0xdeadbeef ;dd 0xdeadbeef
dd APP_STARTUP_THUNK dd APP_STARTUP_THUNK

1
programs/use_fasm.lua
View File

@ -1,5 +1,6 @@
INCLUDES = "" INCLUDES = ""
FASM_DEFAULT = "fasm" FASM_DEFAULT = "fasm"
PESTRIP_CMD = string.gsub(tup.getconfig("PESTRIP_CMD"), "$(ROOT)", ROOT or "")
function add_include(dir) function add_include(dir)
if INCLUDES == "" if INCLUDES == ""