AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #1249 from WorldofBay/patch-2

Browse Source 
do not clear _isIncludingExternal in nested calls
This commit is contained in:
Samuel Surtees 2019-02-24 21:44:46 +10:00 committed by GitHub
commit 4639116959
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/base/api.lua
View File

@ -82,10 +82,11 @@
function includeexternal(fname) function includeexternal(fname)
local fullPath = p.findProjectScript(fname) local fullPath = p.findProjectScript(fname)
local wasIncludingExternal = api._isIncludingExternal
api._isIncludingExternal = true api._isIncludingExternal = true
fname = fullPath or fname fname = fullPath or fname
dofile(fname) dofile(fname)
api._isIncludingExternal = nil api._isIncludingExternal = wasIncludingExternal
end end
p.alias(_G, "includeexternal", "includeExternal") p.alias(_G, "includeexternal", "includeExternal")