sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jérôme Leclercq 2018-02-08 11:43:17 +01:00
parent 7366d92818 db7f778672
commit ac06d5884c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

3
build/scripts/common.lua
View File

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