diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-02 23:06:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-02 23:06:18 +0000 |
| commit | b679478a2885b03f6b4b415d3f9159965a67e19e (patch) | |
| tree | 2e0008d882761609079670e6a965c84da45b8b19 | |
| parent | 9bf2cf3509380663e6943f6b0d22dbec6002c332 (diff) | |
Try to fix font paths.
| -rw-r--r-- | fonts/LiberationSans-Bold.ttf | bin | 0 -> 137372 bytes | |||
| -rw-r--r-- | fonts/LiberationSans-Italic.ttf | bin | 0 -> 164264 bytes | |||
| -rw-r--r-- | fonts/LiberationSans-Regular.ttf | bin | 0 -> 350200 bytes | |||
| -rw-r--r-- | platform/osx/make_dmg.sh | 4 | ||||
| -rw-r--r-- | platform/windows/wscript | 4 | ||||
| -rw-r--r-- | wscript | 4 |
6 files changed, 9 insertions, 3 deletions
diff --git a/fonts/LiberationSans-Bold.ttf b/fonts/LiberationSans-Bold.ttf Binary files differnew file mode 100644 index 000000000..e465dfb12 --- /dev/null +++ b/fonts/LiberationSans-Bold.ttf diff --git a/fonts/LiberationSans-Italic.ttf b/fonts/LiberationSans-Italic.ttf Binary files differnew file mode 100644 index 000000000..1350186fe --- /dev/null +++ b/fonts/LiberationSans-Italic.ttf diff --git a/fonts/LiberationSans-Regular.ttf b/fonts/LiberationSans-Regular.ttf Binary files differnew file mode 100644 index 000000000..626dd9364 --- /dev/null +++ b/fonts/LiberationSans-Regular.ttf diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index ed276da1a..cca55ff28 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -187,7 +187,9 @@ cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/servers.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/tms.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/keys.png "$WORK/$resources" -cp $ROOT/32/src/dcpomatic/LiberationSans-Regular.ttf "$WORK/$resources" +cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$WORK/$resources" +cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$WORK/$resources" +cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/splash.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server_small.png "$WORK/$resources" diff --git a/platform/windows/wscript b/platform/windows/wscript index f28495002..aa5ee2efe 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -216,7 +216,9 @@ File "%binaries%/src/wx/mo/pt_PT/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/pt_PT/dcpomatic2.mo" SetOutPath "$INSTDIR" -File "%resources%/../../LiberationSans-Regular.ttf" +File "%resources%/../../fonts/LiberationSans-Regular.ttf" +File "%resources%/../../fonts/LiberationSans-Italic.ttf" +File "%resources%/../../fonts/LiberationSans-Bold.ttf" File "%graphics%/splash.png" CreateDirectory "$INSTDIR\etc\pango" @@ -442,7 +442,9 @@ def build(bld): bld.recurse('platform/osx') if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') + bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Regular.ttf') + bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Italic.ttf') + bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Bold.ttf') bld.add_post_fun(post) |