Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

.gitignore

@@ -4,6 +4,9 @@ build/config.lua
 # Nazara libraries
 lib/*
 
+# Self-hosted thirdparty libraries binaries
+thirdparty/genlib/*
+
 # Nazara plugin libraries
 plugins/lib/*
 

build/scripts/common.lua

@@ -73,7 +73,7 @@ function NazaraBuild:Execute()
 
 		-- Extern libraries
 		if (self.Config["BuildDependencies"]) then
-			self:FilterLibDirectory("../thirdparty/lib/", targetdir)
+			self:FilterLibDirectory("../thirdparty/genlib/", targetdir) -- For generated libraries
 
 			for k, libTable in ipairs(self.OrderedExtLibs) do
 				project(libTable.Name)
@@ -788,6 +788,7 @@ function NazaraBuild:PrepareGeneric()
 	
 	cppdialect("C++14")
 
+	self:FilterLibDirectory("../thirdparty/genlib/", libdirs)
 	self:FilterLibDirectory("../thirdparty/lib/", libdirs)
 
 	-- Fixes Premake stuff