diff --git a/Core/Actions/buildActionBootstrap.lua b/Core/Actions/buildActionBootstrap.lua index 4dc9b5f..f68571e 100644 --- a/Core/Actions/buildActionBootstrap.lua +++ b/Core/Actions/buildActionBootstrap.lua @@ -158,7 +158,7 @@ local targetName = string.format("%s.%s.%s.%s", projName, projCfg, platformStyle local fileName = targetName if (platform) then - fileName = fileName .. (platform.exts or {})[projType] or "" + fileName = fileName .. ((platform.exts or {})[projType] or "") end if (projectBins) then diff --git a/Core/JSON/jsonProjectHandlers.lua b/Core/JSON/jsonProjectHandlers.lua index 58f744b..d00e7df 100644 --- a/Core/JSON/jsonProjectHandlers.lua +++ b/Core/JSON/jsonProjectHandlers.lua @@ -512,7 +512,7 @@ kGenericTasks = { "bigObject" } -local kReferenceTasks = {"eval", "includes", "include", "includes", "protobuf"} --, "features"} +local kReferenceTasks = {"eval", "includes", "defines", "include", "includes", "protobuf", "actions"} --, "features"} -- , "include-depends", "include-soft-depends" __pRunTasks = function(processor, object, map, tasks, inc, resolve) @@ -535,7 +535,7 @@ local function __pRunLinkTasks(processor, object, resolve) auProjectRefHandlers, { "links", "depends", "soft-depends", "eval", - "linkDepends", "defines", "actions" + "linkDepends", "actions" }, false, resolve)