Merge branch 'master' into vulkan

build/config.lua

@@ -16,6 +16,9 @@ Configurations = "Debug,Release" -- "Debug,Release,ReleaseWithDebug"
 -- Setup additionnals install directories, separated by a semi-colon ; (library binaries will be copied there)
 --InstallDir = "/usr/local/lib64"
 
+-- Adds a project which will recall premake with its original arguments when built
+PremakeProject = true
+
 -- Excludes client-only modules/tools/examples
 ServerMode = false
 

build/scripts/common.lua

@@ -42,7 +42,7 @@ end
 
 function NazaraBuild:Execute()
 	if (_ACTION == nil) then -- If no action is specified, the user probably only wants to know how all of this works
-		return -- Alors l'utilisateur voulait probablement savoir comment utiliser le programme, on ne fait rien
+		return
 	end
 
 	local platformData
@@ -74,7 +74,6 @@ function NazaraBuild:Execute()
 			includedirs("../extlibs/include")
 			libdirs("../extlibs/lib/common")
 			location(_ACTION)
-			kind("StaticLib")
 
 			for k, libTable in ipairs(self.OrderedExtLibs) do
 				project(libTable.Name)
@@ -129,6 +128,13 @@ function NazaraBuild:Execute()
 		language("C++")
 		location(_ACTION)
 
+		if (self.Config["PremakeProject"]) then
+			local commandLine = "premake5.exe " .. table.concat(_ARGV, ' ')
+			project("_PremakeProject")
+				kind("Utility")
+				prebuildcommands("cd .. && " .. commandLine)
+		end
+
 		-- Modules
 		if (_OPTIONS["united"]) then
 			project("NazaraEngine")
@@ -517,9 +523,9 @@ function NazaraBuild:LoadConfig()
 		end
 	end
 
-
 	AddBoolOption("BuildDependencies", "with-extlibs", "Builds the extern libraries")
 	AddBoolOption("BuildExamples", "with-examples", "Builds the examples")
+	AddBoolOption("PremakeProject", "premakeproject", "Add a PremakeProject as a shortcut to call Premake")
 	AddBoolOption("ServerMode", "server", "Excludes client-only modules/tools/examples")
 	AddBoolOption("UniteModules", "united", "Builds all the modules as one united library")