diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-27 19:35:12 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-27 19:35:12 +0200 |
| commit | 5fc2718c509231ead7304bc9bb18a2c7c83f7c5d (patch) | |
| tree | 94b20b6a584346813fb0f203d69d7602036d810e /src | |
| parent | 55f8dac645e2e36575def1021bb1b92b86fb12b5 (diff) | |
Adapt for new libdcp (fixing large compiler resource requirements).
Also adjust Linux resource-finding code to juse look for stuff
relative to the executable's location.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/cross.h | 1 | ||||
| -rw-r--r-- | src/lib/cross_linux.cc | 19 | ||||
| -rw-r--r-- | src/lib/util.cc | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/cross.h b/src/lib/cross.h index 63ae72c01..a53e85a2d 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -55,6 +55,7 @@ extern void maybe_open_console (); #endif extern boost::filesystem::path resources_path (); extern boost::filesystem::path xsd_path (); +extern boost::filesystem::path tags_path (); extern FILE * fopen_boost (boost::filesystem::path, std::string); extern int dcpomatic_fseek (FILE *, int64_t, int); extern void start_batch_converter (); diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 530dda027..5c1bb7d90 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -101,22 +101,21 @@ cpu_info () boost::filesystem::path resources_path () { - char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX"); - if (p) { - return boost::filesystem::path(p) / "dcpomatic2"; - } - return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "dcpomatic2"; + return directory_containing_executable().parent_path() / "share" / "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) / "libdcp" / "xsd"; + return directory_containing_executable().parent_path() / "share" / "libdcp" / "xsd"; +} + + +boost::filesystem::path +tags_path () +{ + return directory_containing_executable().parent_path() / "share" / "libdcp" / "tags"; } diff --git a/src/lib/util.cc b/src/lib/util.cc index 7c0d1dc4e..ac868c173 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -388,7 +388,7 @@ DCPOMATIC_ENABLE_WARNINGS #endif Pango::init (); - dcp::init (); + dcp::init (tags_path()); #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) /* Render something to fontconfig to create its cache */ |