Woops
This commit is contained in:
parent
d14574151a
commit
8147b0807e
|
|
@ -1,8 +1,8 @@
|
||||||
-- This file contains special configurations values, such as directories to extern libraries (Qt)
|
-- This file contains special configurations values, such as directories to extern libraries (Qt)
|
||||||
-- Editing this file is not required to use/compile the engine, as default values should be enough
|
-- Editing this file is not required to use/compile the engine, as default values should be enough
|
||||||
|
|
||||||
-- Additionnal compilation flags
|
-- Additionnal compilation options
|
||||||
--AdditionalCompilationFlags = -fsanitize=address -- Enable ASan
|
--AdditionalCompilationOptions = "-fsanitize=address" -- Enable ASan
|
||||||
|
|
||||||
-- Builds Nazara extern libraries (such as lua/STB)
|
-- Builds Nazara extern libraries (such as lua/STB)
|
||||||
BuildDependencies = true
|
BuildDependencies = true
|
||||||
|
|
|
||||||
|
|
@ -522,7 +522,29 @@ function NazaraBuild:LoadConfig()
|
||||||
AddBoolOption("BuildExamples", "with-examples", "Builds the examples")
|
AddBoolOption("BuildExamples", "with-examples", "Builds the examples")
|
||||||
AddBoolOption("ServerMode", "server", "Excludes client-only modules/tools/examples")
|
AddBoolOption("ServerMode", "server", "Excludes client-only modules/tools/examples")
|
||||||
AddBoolOption("UniteModules", "united", "Builds all the modules as one united library")
|
AddBoolOption("UniteModules", "united", "Builds all the modules as one united library")
|
||||||
AddStringOption("AdditionalCompilationFlags", "compile-flags", "Specify additionnal compilation flags to be added to every generated project")
|
|
||||||
|
-- AdditionalCompilationOptions
|
||||||
|
do
|
||||||
|
newoption({
|
||||||
|
trigger = "compile-options",
|
||||||
|
description = "Specify additionnal compilation options to be added to every generated project."
|
||||||
|
})
|
||||||
|
|
||||||
|
configTable["AdditionalCompilationOptions"] = configTable["AdditionalCompilationOptions"] or ""
|
||||||
|
if (_OPTIONS["compile-options"] ~= nil) then
|
||||||
|
configTable["AdditionalCompilationOptions"] = configTable["AdditionalCompilationOptions"] .. ";" .. _OPTIONS["compile-options"]
|
||||||
|
end
|
||||||
|
|
||||||
|
local configs = {}
|
||||||
|
local paths = string.explode(configTable["AdditionalCompilationOptions"], ";")
|
||||||
|
for k,v in pairs(paths) do
|
||||||
|
if (#v > 0) then
|
||||||
|
table.insert(configs, v)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
configTable["Configurations"] = configs
|
||||||
|
end
|
||||||
|
|
||||||
-- Configurations
|
-- Configurations
|
||||||
do
|
do
|
||||||
|
|
@ -806,6 +828,8 @@ function NazaraBuild:PrepareGeneric()
|
||||||
buildoptions("-ftree-vectorize")
|
buildoptions("-ftree-vectorize")
|
||||||
|
|
||||||
filter({})
|
filter({})
|
||||||
|
|
||||||
|
buildoptions(self.Config["AdditionalCompilationOptions"])
|
||||||
end
|
end
|
||||||
|
|
||||||
function NazaraBuild:PrepareMainWorkspace()
|
function NazaraBuild:PrepareMainWorkspace()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue