From f4e6f6a44f401e0b5cee516f8d767770d1d303f6 Mon Sep 17 00:00:00 2001 From: Apjue Date: Wed, 6 Mar 2019 23:00:30 +0100 Subject: [PATCH] Premake: Set libraries' rpath to current folder (#199) * Set libraries' rpath to . * Update changelog --- ChangeLog.md | 1 + build/scripts/common.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index ba7748cda..3e9a527be 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -19,6 +19,7 @@ Miscellaneous: - When supported, projects are now parts of a virtual "workspace group" according to their kind - Fixed .dll copy when building Nazara occuring on Linux when targeting Windows (MinGW) - ⚠ Appveyor nightlies are now compiled with VS2017 +- Set libraries' rpath to current folder (.) Nazara Engine: - VertexMapper:GetComponentPtr no longer throw an error if component is disabled or incompatible with template type, instead a null pointer is returned. diff --git a/build/scripts/common.lua b/build/scripts/common.lua index ac854c29c..f5f50a9f8 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -876,6 +876,7 @@ function NazaraBuild:PrepareMainWorkspace() -- Add lib/conf/arch to library search path self:FilterLibDirectory("../lib/", libdirs) + self:FilterLibDirectory("../lib/", runpathdirs) filter("action:vs*") buildoptions({"/MP", "/bigobj"}) -- Multiprocessus build and big .obj