diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-20 23:12:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-20 23:12:55 +0100 |
| commit | 137f4b5b6ccf7545d0499f57150b005bdfdf5768 (patch) | |
| tree | 9dcea390cc4d88d40eba20b9a88763dfc099aff4 /platform | |
| parent | 15d7164347404249542dc5ae75cfd37011aef7c3 (diff) | |
| parent | 15235c0d2fad7e916cda5b2d6ce79c4e9a38c4f9 (diff) | |
Merge tag 'v2.16.79' into v2.17.x
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/copy_resources.sh | 3 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 2 | ||||
| -rw-r--r-- | platform/windows/wscript | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/platform/osx/copy_resources.sh b/platform/osx/copy_resources.sh index 82ca60de9..06b6e5985 100644 --- a/platform/osx/copy_resources.sh +++ b/platform/osx/copy_resources.sh @@ -1,7 +1,4 @@ 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/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 9f9cbdd37..6498254e5 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -252,7 +252,7 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/snap*.png "$dest" cp $prefix/src/dcpomatic/graphics/sequence*.png "$dest" cp $prefix/src/dcpomatic/graphics/me.jpg "$dest" - cp $prefix/src/dcpomatic/graphics/link.png "$dest" + cp $prefix/src/dcpomatic/graphics/link*.png "$dest" cp $prefix/src/dcpomatic/graphics/add*.png "$dest" cp $prefix/src/dcpomatic/graphics/pause*.png "$dest" cp -r $prefix/share/libdcp/xsd "$dest" diff --git a/platform/windows/wscript b/platform/windows/wscript index 5af8ca08a..adbd1b0ef 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -340,7 +340,8 @@ File "%graphics%/snap_black.png" File "%graphics%/sequence_white.png" File "%graphics%/sequence_black.png" File "%graphics%/me.jpg" -File "%graphics%/link.png" +File "%graphics%/link_white.png" +File "%graphics%/link_black.png" File "%graphics%/add_black.png" File "%graphics%/add_white.png" File "%graphics%/pause_black.png" |