From 4c804a0d92ebd03b70bfc7f736fcaf5f77cb3bb7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Sep 2020 13:04:16 +0200 Subject: Add xsd_path() and use it to fix access to .xsd files on Linux (#1830). --- src/lib/cross_linux.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/lib/cross_linux.cc') diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index e17f188b9..95bd975f8 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -103,11 +103,23 @@ shared_path () { char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX"); if (p) { - return p; + return boost::filesystem::path(p) / "dcpomatic2"; + } + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "dcpomatic2"; +} + + +boost::filesystem::path +xsd_path () +{ + char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX"); + if (p) { + return boost::filesystem::path(p) / "libdcp" / "xsd"; } - return boost::filesystem::canonical (LINUX_SHARE_PREFIX); + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd"; } + void run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) { -- cgit v1.2.3