diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-15 20:36:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-15 20:36:32 +0100 |
| commit | b4488bd72fcbcc3fe393724c9f4c65697fa949b6 (patch) | |
| tree | c2e0f4228095774287d725cfa14f786f327e507c | |
| parent | db40e9a10b22085d124521763a8f12a290ba76f7 (diff) | |
Get prefs icons from the source tree on when starting from the macOS console.
| -rw-r--r-- | platform/osx/copy_resources.sh | 1 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/platform/osx/copy_resources.sh b/platform/osx/copy_resources.sh index 82ca60de9..0b5d61283 100644 --- a/platform/osx/copy_resources.sh +++ b/platform/osx/copy_resources.sh @@ -2,6 +2,5 @@ mkdir -p build/src/Resources cp -r ../libdcp/{tags,xsd,ratings} build/src/Resources cp graphics/{link,splash}.png build/src/Resources cp graphics/{select,snap,sequence,zoom,zoom_all}.png build/src/Resources -cp graphics/osx/preferences/*.png build/src/Resources cp fonts/*.ttf build/src/Resources ln -s $(which openssl) build/src/tools/openssl diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index c0f90bd25..28ac6ab5c 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -670,6 +670,10 @@ bitmap_path (string name) } else { base = resources_path(); } + + if (!boost::filesystem::exists(base / name)) { + base = path / boost::filesystem::path("osx/preferences"); + } #else base = resources_path(); #endif |