Build: Add support for external includes

build/scripts/common.lua

@@ -104,8 +104,9 @@ function NazaraBuild:Execute()
 				defines(libTable.Defines)
 				flags(libTable.Flags)
 				kind("StaticLib") -- Force them as static libs
-				includedirs("../thirdparty/include")
+				sysincludedirs("../thirdparty/include")
 				includedirs(libTable.Includes)
+				sysincludedirs(libTable.ExtIncludes)
 				links(libTable.Libraries)
 				libdirs("../thirdparty/lib/common")
 
@@ -155,9 +156,9 @@ function NazaraBuild:Execute()
 
 			includedirs({
 				"../include",
-				"../src/",
+				"../src/"
-				"../thirdparty/include"
 			})
+			sysincludedirs("../thirdparty/include")
 
 			files(moduleTable.Files)
 			excludes(moduleTable.FilesExcluded)
@@ -165,6 +166,7 @@ function NazaraBuild:Execute()
 			defines(moduleTable.Defines)
 			flags(moduleTable.Flags)
 			includedirs(moduleTable.Includes)
+			sysincludedirs(moduleTable.ExtIncludes)
 			links(moduleTable.Libraries)
 
 			libdirs({
@@ -236,10 +238,8 @@ function NazaraBuild:Execute()
 				assert(false, "Invalid tool kind")
 			end
 
-			includedirs({
+			includedirs("../include")
-				"../include",
+			sysincludedirs("../thirdparty/include")
-				"../thirdparty/include"
-			})
 
 			libdirs({
 				"../thirdparty/lib/common",
@@ -252,6 +252,7 @@ function NazaraBuild:Execute()
 			defines(toolTable.Defines)
 			flags(toolTable.Flags)
 			includedirs(toolTable.Includes)
+			sysincludedirs(toolTable.ExtIncludes)
 			links(toolTable.Libraries)
 
 			-- Output to lib/conf/arch
@@ -308,11 +309,10 @@ function NazaraBuild:Execute()
 			end
 
 			debugdir(destPath)
-			includedirs({
+			includedirs("../include")
-				"../include",
+			includedirs(exampleTable.Includes)
-				"../thirdparty/include",
+			sysincludedirs("../thirdparty/include")
-				exampleTable.Includes
+			sysincludedirs(exampleTable.ExtIncludes)
-			})
 			libdirs({
 				"../lib",
 				exampleTable.LibDir
@@ -784,6 +784,10 @@ function NazaraBuild:Process(infoTable)
 					table.insert(infoTable.Includes, v)
 				end
 
+				for k,v in ipairs(libraryTable.ExtIncludes) do
+					table.insert(infoTable.ExtIncludes, v)
+				end
+
 				-- And libraries
 				for k, v in pairs(libraryTable.Libraries) do
 					table.insert(infoTable.Libraries, v)
@@ -1180,7 +1184,7 @@ function NazaraBuild:SetupInfoTable(infoTable)
 	infoTable.LibraryPaths.x86 = {}
 	infoTable.LibraryPaths.x64 = {}
 
-	local infos = {"Defines", "DynLib", "Files", "FilesExcluded", "Flags", "Includes", "Libraries"}
+	local infos = {"Defines", "DynLib", "Files", "FilesExcluded", "Flags", "Includes", "Libraries", "ExtIncludes"}
 	for k,v in ipairs(infos) do
 		infoTable[v] = {}
 		infoTable["Os" .. v] = {}

build/scripts/tools/assimp.lua

@@ -4,11 +4,14 @@ TOOL.Directory = "../plugins/Assimp"
 TOOL.Kind = "Plugin"
 
 TOOL.Includes = {
-	"../thirdparty/include",
 	"../include",
     "../plugins/Assimp"
 }
 
+TOOL.ExtIncludes = {
+	"../thirdparty/include"
+}
+
 TOOL.Files = {
 	"../plugins/Assimp/**.hpp",
 	"../plugins/Assimp/**.inl",

build/scripts/tools/openglrenderer.lua

@@ -12,7 +12,10 @@ TOOL.Defines = {
 
 TOOL.Includes = {
 	"../include",
-	"../src/",
+	"../src/"
+}
+
+TOOL.ExtIncludes = {
 	"../extlibs/include"
 }
 

build/scripts/tools/shadernodes.lua

@@ -11,10 +11,13 @@ TOOL.Defines = {
 
 TOOL.Includes = {
 	"../include",
-	"../extlibs/include",
 	"../src"
 }
 
+TOOL.ExtIncludes = {
+	"../extlibs/include"
+}
+
 TOOL.Files = {
 	"../src/ShaderNode/**.hpp",
 	"../src/ShaderNode/**.inl",

build/scripts/tools/vulkanrenderer.lua

@@ -13,7 +13,10 @@ TOOL.Defines = {
 
 TOOL.Includes = {
 	"../include",
-	"../src/",
+	"../src/"
+}
+
+TOOL.ExtIncludes = {
 	"../extlibs/include"
 }