From: Carl Hetherington <cth@carlh.net>
Date: Mon, 2 Nov 2015 23:06:18 +0000 (+0000)
Subject: Try to fix font paths.
X-Git-Tag: v2.4.16~20
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b679478a2885b03f6b4b415d3f9159965a67e19e

Try to fix font paths.
---

diff --git a/fonts/LiberationSans-Bold.ttf b/fonts/LiberationSans-Bold.ttf
new file mode 100644
index 000000000..e465dfb12
Binary files /dev/null and b/fonts/LiberationSans-Bold.ttf differ
diff --git a/fonts/LiberationSans-Italic.ttf b/fonts/LiberationSans-Italic.ttf
new file mode 100644
index 000000000..1350186fe
Binary files /dev/null and b/fonts/LiberationSans-Italic.ttf differ
diff --git a/fonts/LiberationSans-Regular.ttf b/fonts/LiberationSans-Regular.ttf
new file mode 100644
index 000000000..626dd9364
Binary files /dev/null and b/fonts/LiberationSans-Regular.ttf differ
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"
diff --git a/wscript b/wscript
index f0649e8e0..b5ff29b98 100644
--- a/wscript
+++ b/wscript
@@ -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)