summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-30 22:20:57 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-30 22:20:57 +0100
commita5e87b6f0f496f4ed71d9129d40a5baebb68495f (patch)
treea9f7dcf6a2020e986e1d709f24ce46e51d238ca2 /wscript
parent895e908f7dcc8deb9e6a333d3d6b3a92aec2dc09 (diff)
Various bits related to subtitle font handling, particularly copying fonts to the DCP.
Diffstat (limited to 'wscript')
-rw-r--r--wscript7
1 files changed, 4 insertions, 3 deletions
diff --git a/wscript b/wscript
index be7b0f985..4da8c8877 100644
--- a/wscript
+++ b/wscript
@@ -224,8 +224,6 @@ def configure(conf):
# POSIX
if conf.env.TARGET_LINUX or conf.env.TARGET_OSX:
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
- conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
- conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
boost_lib_suffix = ''
boost_thread = 'boost_thread'
conf.env.append_value('LINKFLAGS', '-pthread')
@@ -233,6 +231,8 @@ def configure(conf):
# Linux
if conf.env.TARGET_LINUX:
conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
+ conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
+ conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
if conf.env.TARGET_DEBIAN:
@@ -374,8 +374,9 @@ def build(bld):
for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r)
- if not bld.env.TARGET_WINDOWS:
+ if bld.env.TARGET_LINUX:
bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png')
+ bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
bld.add_post_fun(post)