Get prefs icons from the source tree on when starting from the macOS console.

diff --git a/platform/osx/copy_resources.sh b/platform/osx/copy_resources.sh
index 82ca60de990c72d77d4ed7e42a8ca46eff8fc3d0..0b5d6128355e278d99cd6f1251ab5b1564afd235 100644 (file)
--- 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 c0f90bd251083676377928818d39d1795c81aa0a..28ac6ab5c5b4bb4bace0bec0020ffd4c82aa1453 100644 (file)
--- 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