summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-07 19:25:33 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-07 19:25:33 +0100
commitd62877ae6c4e316e43f4052e4b9ba673610012cf (patch)
tree3bc50c7c1d625f76dba47128b24326994d593fdb /wscript
parent5859b758e3a6e0191ce12e77b636c7def58bbc3b (diff)
parentfa3ed3149bd2464d920f54c92b99f57ce9b4d75f (diff)
Merge master.
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 4 insertions, 0 deletions
diff --git a/wscript b/wscript
index a85f3bf9c..829a9e834 100644
--- a/wscript
+++ b/wscript
@@ -37,6 +37,7 @@ def configure(conf):
else:
conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX')
conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX'])
+ conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dvdomatic"' % conf.env['PREFIX'])
boost_lib_suffix = ''
boost_thread = 'boost_thread'
conf.env.append_value('LINKFLAGS', '-pthread')
@@ -234,6 +235,9 @@ def build(bld):
for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
+ if not bld.env.TARGET_WINDOWS:
+ bld.install_files('${PREFIX}/share/dvdomatic', 'icons/taskbar_icon.png')
+
bld.add_post_fun(post)
def dist(ctx):