diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-04-03 22:58:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-04-03 22:58:44 +0100 |
| commit | 36971ecc260b46a4092a4ba3099c3e52e2d1b916 (patch) | |
| tree | 46ef3e31e41d387453fdca9963d9cca0586144d0 /platform | |
| parent | ca525d4d6371baee4f3aa9a0888f436b9458ee30 (diff) | |
Add fonts.conf to OS X build to try to fix failure to synthesizev2.13.142
bold/italic on 10.12 (Sierra) and earlier (#1524).
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | platform/windows/wscript | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index b9cdaec2d..4afb54700 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -129,6 +129,7 @@ function copy_resources { cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest" cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest" cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest" + cp $ROOT/32/src/dcpomatic/fonts/fonts.conf.osx "$dest"/fonts.conf cp $ROOT/32/src/dcpomatic/graphics/splash.png "$dest" cp $ROOT/32/src/dcpomatic/graphics/zoom.png "$dest" cp $ROOT/32/src/dcpomatic/graphics/zoom_all.png "$dest" diff --git a/platform/windows/wscript b/platform/windows/wscript index baca6b553..a6b705496 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -294,7 +294,7 @@ SetOutPath "$INSTDIR" File "%resources%/../../fonts/LiberationSans-Regular.ttf" File "%resources%/../../fonts/LiberationSans-Italic.ttf" File "%resources%/../../fonts/LiberationSans-Bold.ttf" -File "%resources%/../../fonts/fonts.conf" +File /oname=fonts.conf "%resources%/../../fonts/fonts.conf.windows" File "%graphics%/splash.png" File "%graphics%/zoom.png" File "%graphics%/zoom_all.png" |