diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-14 13:09:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-14 13:09:04 +0200 |
| commit | e3c78ffdb5e562841e86e6f59a20494159c44de7 (patch) | |
| tree | 81a4384eafabbd84975ccbb733c944cb6205cb46 /src/lib/util.cc | |
| parent | 4c804a0d92ebd03b70bfc7f736fcaf5f77cb3bb7 (diff) | |
Rename shared_path -> resources_path.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 84138f4d9..8ac395b37 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -379,12 +379,12 @@ DCPOMATIC_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS putenv ("PANGOCAIRO_BACKEND=fontconfig"); - putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str()); + putenv (String::compose("FONTCONFIG_PATH=%1", resources_path().string()).c_str()); #endif #ifdef DCPOMATIC_OSX setenv ("PANGOCAIRO_BACKEND", "fontconfig", 1); - setenv ("FONTCONFIG_PATH", shared_path().string().c_str(), 1); + setenv ("FONTCONFIG_PATH", resources_path().string().c_str(), 1); #endif Pango::init (); @@ -1259,10 +1259,10 @@ default_font_file () { boost::filesystem::path liberation_normal; try { - liberation_normal = shared_path() / "LiberationSans-Regular.ttf"; + liberation_normal = resources_path() / "LiberationSans-Regular.ttf"; if (!boost::filesystem::exists (liberation_normal)) { /* Hack for unit tests */ - liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf"; + liberation_normal = resources_path() / "fonts" / "LiberationSans-Regular.ttf"; } } catch (boost::filesystem::filesystem_error& e) { |