diff --git a/Core/JSON/jsonProjectHandlers.lua b/Core/JSON/jsonProjectHandlers.lua index e1614cd..ff6cea0 100644 --- a/Core/JSON/jsonProjectHandlers.lua +++ b/Core/JSON/jsonProjectHandlers.lua @@ -105,7 +105,9 @@ local function auBlockProjectKeyDefines(processor, value) end local function auBlockProjectKeyIncludes(processor, value, map, tasks, inc) - _includeDirectoryEx(processor:getMeta().path .. "/" .. value, not inc) + filterForKey(value, "value", function(value) + _includeDirectoryEx(processor:getMeta().path .. "/" .. value, not inc) + end, true) end local function auBlockProjectKeyFeatures(processor, value) @@ -123,17 +125,19 @@ local function auBlockProjectKeySources(processor, value) end local function auBlockProjectKeySourcePaths(processor, value) - local source = value - local path = processor:getMeta().path - files - { - path .. "/" .. source .. "/**.*pp", - path .. "/" .. source .. "/**.inl", - path .. "/" .. source .. "/**.c", - path .. "/" .. source .. "/**.cc", - path .. "/" .. source .. "/**.h", - path .. "/" .. source .. "/**.masm" - } + filterForKey(value, "path", function(value) + local source = value + local path = processor:getMeta().path + files + { + path .. "/" .. source .. "/**.*pp", + path .. "/" .. source .. "/**.inl", + path .. "/" .. source .. "/**.c", + path .. "/" .. source .. "/**.cc", + path .. "/" .. source .. "/**.h", + path .. "/" .. source .. "/**.masm" + } + end, true) end local function auBlockProjectKeyEval(processor, value, map, tasksMask)