From aec4d12a3bf402253745f22759111c9669120933 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Fri, 20 Jan 2017 13:04:48 +0000 Subject: [PATCH] revert using INCLUDE= from r6834 because it breaks build on Windows git-svn-id: svn://kolibrios.org@6839 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/launch/trunk/Tupfile.lua | 3 +-- programs/system/launch/trunk/launch.asm | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/system/launch/trunk/Tupfile.lua b/programs/system/launch/trunk/Tupfile.lua index 175ff56dd6..ff561b0899 100644 --- a/programs/system/launch/trunk/Tupfile.lua +++ b/programs/system/launch/trunk/Tupfile.lua @@ -1,3 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") -tup.rule("launch.asm", "INCLUDE=" .. HELPERDIR .. " fasm %f %o -dlang=" .. tup.getconfig("LANG") .. tup.getconfig("KPACK_CMD"), "launch") +tup.rule("launch.asm", "fasm %f %o -dlang=" .. tup.getconfig("LANG") .. tup.getconfig("KPACK_CMD"), "launch") diff --git a/programs/system/launch/trunk/launch.asm b/programs/system/launch/trunk/launch.asm index 0a1d563da1..c2f1c2de1f 100755 --- a/programs/system/launch/trunk/launch.asm +++ b/programs/system/launch/trunk/launch.asm @@ -43,10 +43,10 @@ define DEBUG_MAX_LEN 8 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 '../../../develop/libraries/libs-dev/libio/libio.inc' +include '../../../dll.inc' purge mov