AuroraPipeline/Build
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[*] Bug fix configureProjectForPlatform

Browse Source 
[*] Missing prefix (au)ConcatArrays
[-] Old handleEval handler
This commit is contained in:
Reece Wilson 2022-02-21 21:33:17 +00:00
parent 3b9bf8adf1
commit 3a79d9e0df
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/Legacy/jsonProcessor.lua
View File

@ -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

2
Core/project.lua
View File

@ -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)