diff --git a/Core/Legacy/jsonProcessor.lua b/Core/Legacy/jsonProcessor.lua index 83ae206..4f7e09c 100644 --- a/Core/Legacy/jsonProcessor.lua +++ b/Core/Legacy/jsonProcessor.lua @@ -229,20 +229,6 @@ function JsonProcessor(info) addM4Defines(object.m4Defines) end - function handleEval(object) - if (auIsArray(object)) then - auForEach(object, handleEval) - return - end - - if (type(object) == "string") then - auEval(object) - return - end - - processJsonBlock(object) - end - if (not isUtility) then processJsonBlock(result) @@ -253,8 +239,8 @@ function JsonProcessor(info) if (result.valaSrc) then local sources = result.valaSrc - local gir = concatArrays(auValaGirs, result.valaGirs) - local vapi = concatArrays(auValaDevVApis, result.valaDevVApis) + local gir = auConcatArrays(auValaGirs, result.valaGirs) + local vapi = auConcatArrays(auValaDevVApis, result.valaDevVApis) local valIncludes = result.valaInclude local valGirFile = result.valGirFile local header = result.valaHeader diff --git a/Core/project.lua b/Core/project.lua index 6231048..84eaa58 100644 --- a/Core/project.lua +++ b/Core/project.lua @@ -96,7 +96,7 @@ local function configureProjectForCompiler() filter {} end -local function configureProjectForPlatform(platform, projType) +local function configureProjectForPlatform(platform, projectType) if (platform == "win32") then characterset(Aurora.Settings.sMsvcDefCharset)