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

revert using INCLUDE= from r6834 because it breaks build on Windows

Browse Source 
git-svn-id: svn://kolibrios.org@6839 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2017-01-20 13:04:48 +00:00
parent e62f07f5ff
commit aec4d12a3b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/system/launch/trunk/Tupfile.lua
View File

@ -1,3 +1,2 @@
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") tup.rule("launch.asm", "fasm %f %o -dlang=" .. tup.getconfig("LANG") .. tup.getconfig("KPACK_CMD"), "launch")
tup.rule("launch.asm", "INCLUDE=" .. HELPERDIR .. " fasm %f %o -dlang=" .. tup.getconfig("LANG") .. tup.getconfig("KPACK_CMD"), "launch")

8
programs/system/launch/trunk/launch.asm
View File

@ -43,10 +43,10 @@ define DEBUG_MAX_LEN 8
define DEBUG_DEFAULT 0 define DEBUG_DEFAULT 0
define BUFF_SIZE 1024 define BUFF_SIZE 1024
include 'proc32.inc' include '../../../proc32.inc'
include 'macros.inc' include '../../../macros.inc'
include 'develop/libraries/libs-dev/libio/libio.inc' include '../../../develop/libraries/libs-dev/libio/libio.inc'
include 'dll.inc' include '../../../dll.inc'
purge mov purge mov