From db7f7786720fef260bf7617d10126e5d0d8b5b6f Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 7 Feb 2018 18:18:55 +0100 Subject: [PATCH] Build self-hosted lib in a different folder and .gitignore it --- .gitignore | 3 +++ build/scripts/common.lua | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c3b787c86..92e76fa18 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ build/config.lua # Nazara libraries lib/* +# Self-hosted thirdparty libraries binaries +thirdparty/genlib/* + # Nazara plugin libraries plugins/lib/* diff --git a/build/scripts/common.lua b/build/scripts/common.lua index adc069ab5..28243e888 100644 --- a/build/scripts/common.lua +++ b/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