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

118
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
end
if (self.Actions[_ACTION] ~= nil) then
self.Actions[_ACTION].Function()
else
if (self.Actions[_ACTION] == nil) then
if (#self.OrderedExtLibs > 0) then
solution("NazaraExtlibs")
platforms({"x32", "x64"})
@ -325,66 +323,66 @@ function NazaraBuild:Execute()
configuration({})
end
end
for k, exampleTable in ipairs(self.OrderedExamples) do
project("Demo" .. exampleTable.Name)
for k, exampleTable in ipairs(self.OrderedExamples) do
project("Demo" .. exampleTable.Name)
location(_ACTION .. "/examples")
location(_ACTION .. "/examples")
if (exampleTable.Console) then
kind("ConsoleApp")
else
kind("Window")
if (exampleTable.Console) then
kind("ConsoleApp")
else
kind("Window")
end
debugdir("../examples/bin")
includedirs({
"../include",
"../extlibs/include"
})
libdirs("../lib")
targetdir("../examples/bin")
files(exampleTable.Files)
excludes(exampleTable.FilesExclusion)
defines(exampleTable.Defines)
flags(exampleTable.Flags)
includedirs(exampleTable.Includes)
links(exampleTable.Libraries)
configuration("x32")
libdirs("../extlibs/lib/common/x86")
configuration("x64")
defines("NAZARA_PLATFORM_x64")
libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../lib/mingw/x86")
configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../lib/mingw/x64")
configuration({"vs*", "x32"})
libdirs("../lib/msvc/x86")
configuration({"vs*", "x64"})
libdirs("../lib/msvc/x64")
configuration({"xcode3 or xcode4", "x32"})
libdirs("../lib/xcode/x86")
configuration({"xcode3 or xcode4", "x64"})
libdirs("../lib/xcode/x64")
for k,v in pairs(exampleTable.ConfigurationLibraries) do
configuration(k)
links(v)
end
configuration({})
end
debugdir("../examples/bin")
includedirs({
"../include",
"../extlibs/include"
})
libdirs("../lib")
targetdir("../examples/bin")
files(exampleTable.Files)
excludes(exampleTable.FilesExclusion)
defines(exampleTable.Defines)
flags(exampleTable.Flags)
includedirs(exampleTable.Includes)
links(exampleTable.Libraries)
configuration("x32")
libdirs("../extlibs/lib/common/x86")
configuration("x64")
defines("NAZARA_PLATFORM_x64")
libdirs("../extlibs/lib/common/x64")
configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../lib/mingw/x86")
configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../lib/mingw/x64")
configuration({"vs*", "x32"})
libdirs("../lib/msvc/x86")
configuration({"vs*", "x64"})
libdirs("../lib/msvc/x64")
configuration({"xcode3 or xcode4", "x32"})
libdirs("../lib/xcode/x86")
configuration({"xcode3 or xcode4", "x64"})
libdirs("../lib/xcode/x64")
for k,v in pairs(exampleTable.ConfigurationLibraries) do
configuration(k)
links(v)
end
configuration({})
end
end
@ -590,7 +588,7 @@ function NazaraBuild:RegisterAction(actionTable)
{
trigger = lowerCaseName,
description = actionTable.Description,
execute = actionTable.Function
execute = function () actionTable:Function() end
}
return true