sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build/Common: Fix double execution of actions 

Former-commit-id: b7279f39c57f3f2b1974642525dd4dea3d412781
This commit is contained in:
Lynix 2015-06-21 14:54:29 +02:00
parent 80d4acfe32
commit ec21416231
1 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/scripts/common.lua
View File

@ -5,9 +5,7 @@ function NazaraBuild:Execute()
return -- Alors l'utilisateur voulait probablement savoir comment utiliser le programme, on ne fait rien return -- Alors l'utilisateur voulait probablement savoir comment utiliser le programme, on ne fait rien
end end
if (self.Actions[_ACTION] ~= nil) then if (self.Actions[_ACTION] == nil) then
self.Actions[_ACTION].Function()
else
if (#self.OrderedExtLibs > 0) then if (#self.OrderedExtLibs > 0) then
solution("NazaraExtlibs") solution("NazaraExtlibs")
platforms({"x32", "x64"}) platforms({"x32", "x64"})
@ -325,7 +323,6 @@ function NazaraBuild:Execute()
configuration({}) configuration({})
end end
end
for k, exampleTable in ipairs(self.OrderedExamples) do for k, exampleTable in ipairs(self.OrderedExamples) do
project("Demo" .. exampleTable.Name) project("Demo" .. exampleTable.Name)
@ -386,6 +383,7 @@ function NazaraBuild:Execute()
configuration({}) configuration({})
end end
end
end end
function NazaraBuild:Initialize() function NazaraBuild:Initialize()
@ -590,7 +588,7 @@ function NazaraBuild:RegisterAction(actionTable)
{ {
trigger = lowerCaseName, trigger = lowerCaseName,
description = actionTable.Description, description = actionTable.Description,
execute = actionTable.Function execute = function () actionTable:Function() end
} }
return true return true