Build: Gather projects around categories

This commit is contained in:
Jérôme Leclercq 2018-05-16 12:55:36 +02:00
parent b22c93fa5f
commit f864fc8a52
2 changed files with 18 additions and 7 deletions

View File

@ -16,6 +16,7 @@ Miscellaneous:
- Add Lua unit tests - Add Lua unit tests
- NDEBUG is now defined in Release - NDEBUG is now defined in Release
- Replaced typedefs keywords with modern using keywords - Replaced typedefs keywords with modern using keywords
- When supported, projects are now parts of a virtual "workspace group" according to their kind
Nazara Engine: Nazara Engine:
- VertexMapper:GetComponentPtr no longer throw an error if component is disabled or incompatible with template type, instead a null pointer is returned. - VertexMapper:GetComponentPtr no longer throw an error if component is disabled or incompatible with template type, instead a null pointer is returned.

View File

@ -71,10 +71,21 @@ function NazaraBuild:Execute()
configurations(configs) configurations(configs)
end end
if (self.Config["PremakeProject"] and os.ishost("windows")) then
group("_Premake")
local commandLine = "premake5.exe " .. table.concat(_ARGV, ' ')
project("Regenerate premake")
kind("Utility")
prebuildcommands("cd .. && " .. commandLine)
end
-- Extern libraries -- Extern libraries
if (self.Config["BuildDependencies"]) then if (self.Config["BuildDependencies"]) then
self:FilterLibDirectory("../thirdparty/genlib/", targetdir) -- For generated libraries self:FilterLibDirectory("../thirdparty/genlib/", targetdir) -- For generated libraries
group("Thirdparties")
for k, libTable in ipairs(self.OrderedExtLibs) do for k, libTable in ipairs(self.OrderedExtLibs) do
project(libTable.Name) project(libTable.Name)
@ -112,14 +123,9 @@ function NazaraBuild:Execute()
end end
end end
if (self.Config["PremakeProject"] and os.ishost("windows")) then
local commandLine = "premake5.exe " .. table.concat(_ARGV, ' ')
project("_PremakeProject")
kind("Utility")
prebuildcommands("cd .. && " .. commandLine)
end
-- Modules -- Modules
group("Engine Modules")
if (_OPTIONS["united"]) then if (_OPTIONS["united"]) then
project("NazaraEngine") project("NazaraEngine")
@ -175,6 +181,8 @@ function NazaraBuild:Execute()
end end
-- Tools -- Tools
group("Engine SDK - Tools")
for k, toolTable in ipairs(self.OrderedTools) do for k, toolTable in ipairs(self.OrderedTools) do
local prefix = "Nazara" local prefix = "Nazara"
if (toolTable.Kind == "plugin") then if (toolTable.Kind == "plugin") then
@ -243,6 +251,8 @@ function NazaraBuild:Execute()
filter({}) filter({})
end end
group("Examples")
for k, exampleTable in ipairs(self.OrderedExamples) do for k, exampleTable in ipairs(self.OrderedExamples) do
local destPath = "../examples/bin" local destPath = "../examples/bin"