[*] Bug fix configureProjectForPlatform
[*] Missing prefix (au)ConcatArrays [-] Old handleEval handler
This commit is contained in:
parent
3b9bf8adf1
commit
3a79d9e0df
@ -229,20 +229,6 @@ function JsonProcessor(info)
|
|||||||
addM4Defines(object.m4Defines)
|
addM4Defines(object.m4Defines)
|
||||||
end
|
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
|
if (not isUtility) then
|
||||||
processJsonBlock(result)
|
processJsonBlock(result)
|
||||||
|
|
||||||
@ -253,8 +239,8 @@ function JsonProcessor(info)
|
|||||||
|
|
||||||
if (result.valaSrc) then
|
if (result.valaSrc) then
|
||||||
local sources = result.valaSrc
|
local sources = result.valaSrc
|
||||||
local gir = concatArrays(auValaGirs, result.valaGirs)
|
local gir = auConcatArrays(auValaGirs, result.valaGirs)
|
||||||
local vapi = concatArrays(auValaDevVApis, result.valaDevVApis)
|
local vapi = auConcatArrays(auValaDevVApis, result.valaDevVApis)
|
||||||
local valIncludes = result.valaInclude
|
local valIncludes = result.valaInclude
|
||||||
local valGirFile = result.valGirFile
|
local valGirFile = result.valGirFile
|
||||||
local header = result.valaHeader
|
local header = result.valaHeader
|
||||||
|
@ -96,7 +96,7 @@ local function configureProjectForCompiler()
|
|||||||
filter {}
|
filter {}
|
||||||
end
|
end
|
||||||
|
|
||||||
local function configureProjectForPlatform(platform, projType)
|
local function configureProjectForPlatform(platform, projectType)
|
||||||
if (platform == "win32") then
|
if (platform == "win32") then
|
||||||
|
|
||||||
characterset(Aurora.Settings.sMsvcDefCharset)
|
characterset(Aurora.Settings.sMsvcDefCharset)
|
||||||
|
Loading…
Reference in New Issue
Block a user