Merge master.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 9914b3292f4ebf74f73baf304591ba3dbe36583f..60b53a199f324d72fa4237ebaf3ef583f2bc041f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.78beta16'
+VERSION = '0.82pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -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):