Build: Little refactor

This commit is contained in:
Lynix 2016-12-09 08:58:19 +01:00
parent d62720d610
commit 1334dc1fc2
1 changed files with 22 additions and 11 deletions

View File

@ -104,7 +104,7 @@ function NazaraBuild:Execute()
filter({}) filter({})
end end
end end
-- Start defining projects -- Start defining projects
workspace("NazaraEngine") workspace("NazaraEngine")
platforms(platformData) platforms(platformData)
@ -169,7 +169,7 @@ function NazaraBuild:Execute()
for k,v in pairs(moduleTable.ConfigurationLibraries) do for k,v in pairs(moduleTable.ConfigurationLibraries) do
filter(k) filter(k)
links(v) links(v)
end end
filter({}) filter({})
@ -236,7 +236,7 @@ function NazaraBuild:Execute()
for k,v in pairs(toolTable.ConfigurationLibraries) do for k,v in pairs(toolTable.ConfigurationLibraries) do
filter(k) filter(k)
links(v) links(v)
end end
filter({}) filter({})
@ -282,7 +282,7 @@ function NazaraBuild:Execute()
for k,v in pairs(exampleTable.ConfigurationLibraries) do for k,v in pairs(exampleTable.ConfigurationLibraries) do
filter(k) filter(k)
links(v) links(v)
end end
filter({}) filter({})
@ -511,15 +511,26 @@ function NazaraBuild:LoadConfig()
description = "Setup additionnals install directories (library binaries will be copied there)" description = "Setup additionnals install directories (library binaries will be copied there)"
}) })
self.Config["InstallDir"] = self.Config["InstallDir"] or "" configTable["Configurations"] = configs
if (_OPTIONS["install-path"] ~= nil) then
self.Config["InstallDir"] = self.Config["InstallDir"] .. ";" .. _OPTIONS["install-path"]
end end
local paths = string.explode(self.Config["InstallDir"], ";") -- InstallDir
for k,v in pairs(paths) do do
if (#v > 0) then newoption({
self:AddInstallPath(v) trigger = "install-path",
description = "Setup additionnals install directories (library binaries will be copied there), separated by commas"
})
configTable["InstallDir"] = configTable["InstallDir"] or ""
if (_OPTIONS["install-path"] ~= nil) then
configTable["InstallDir"] = configTable["InstallDir"] .. ";" .. _OPTIONS["install-path"]
end
local paths = string.explode(configTable["InstallDir"], ";")
for k,v in pairs(paths) do
if (#v > 0) then
self:AddInstallPath(v)
end
end end
end end
end end