From 8147b0807e1e27d5d0d02cc516600349c7808bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Mon, 6 Mar 2017 13:16:55 +0100
Subject: [PATCH] Woops

---
 build/config.lua         |  4 ++--
 build/scripts/common.lua | 26 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/build/config.lua b/build/config.lua
index 7c3e5a910..12a9f8e77 100644
--- a/build/config.lua
+++ b/build/config.lua
@@ -1,8 +1,8 @@
 -- 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
 
--- Additionnal compilation flags
---AdditionalCompilationFlags = -fsanitize=address -- Enable ASan
+-- Additionnal compilation options
+--AdditionalCompilationOptions = "-fsanitize=address" -- Enable ASan
 
 -- Builds Nazara extern libraries (such as lua/STB)
 BuildDependencies = true
diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index 55654c641..790ef2469 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -522,7 +522,29 @@ function NazaraBuild:LoadConfig()
 	AddBoolOption("BuildExamples", "with-examples", "Builds the examples")
 	AddBoolOption("ServerMode", "server", "Excludes client-only modules/tools/examples")
 	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
 	do
@@ -806,6 +828,8 @@ function NazaraBuild:PrepareGeneric()
 		buildoptions("-ftree-vectorize")
 
 	filter({})
+	
+	buildoptions(self.Config["AdditionalCompilationOptions"])
 end
 
 function NazaraBuild:PrepareMainWorkspace()