From b48efcdac640e7746612fd64899291f7af7b58ac Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 6 Feb 2020 10:02:41 +1100 Subject: Revert "Sync with GENie upstream revision ce9f3c5 (#6262)" (#6263) This reverts commit a06d8e9cc68e6c91fcd58770e972ff81ffd20275. --- 3rdparty/genie/scripts/embed.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '3rdparty/genie/scripts/embed.lua') diff --git a/3rdparty/genie/scripts/embed.lua b/3rdparty/genie/scripts/embed.lua index 39703b1dd4a..05165923c16 100644 --- a/3rdparty/genie/scripts/embed.lua +++ b/3rdparty/genie/scripts/embed.lua @@ -5,8 +5,6 @@ -- issues in Mac OS X Universal builds. -- - local scriptdir = path.getdirectory(_SCRIPT) - local function stripfile(fname) local f = io.open(fname) local s = assert(f:read("*a")) @@ -75,13 +73,13 @@ function doembed() -- load the manifest of script files - scripts = dofile(path.join(scriptdir, "../src/_manifest.lua")) + scripts = dofile("../src/_manifest.lua") -- main script always goes at the end table.insert(scripts, "_premake_main.lua") -- open scripts.c and write the file header - local out = io.open(path.join(scriptdir, "../src/host/scripts.c"), "w+b") + local out = io.open("../src/host/scripts.c", "w+b") out:write("/* Premake's Lua scripts, as static data buffers for release mode builds */\n") out:write("/* DO NOT EDIT - this file is autogenerated - see BUILD.txt */\n") out:write("/* To regenerate this file, run: premake4 embed */ \n\n") @@ -89,7 +87,7 @@ for i,fn in ipairs(scripts) do print(fn) - local s = stripfile(path.join(scriptdir,"../src/" .. fn)) + local s = stripfile("../src/" .. fn) writefile(out, fn, s) end -- cgit v1.2.3-70-g09d2