X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ad2f1d72253865f08f2f67e31336061a857a6043;hb=1ea900312a3a1dedf15f7b4c749fd8a7eb8a9a52;hp=c9050fd2799d178cb383cd133f014f352dbe8896;hpb=ab61378c6ef96fe4e57a8e52e935fcc18c02930d;p=dcpomatic.git diff --git a/wscript b/wscript index c9050fd27..ad2f1d722 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.36' +VERSION = '2.1.44' def options(opt): opt.load('compiler_cxx') @@ -277,7 +277,7 @@ def configure(conf): conf.env['LIB_%s' % name.upper()] = libs conf.env['STLIB_%s' % name.upper()] = stlibs - conf.env['INCLUDE_%s' % name.upper()] = include + conf.env['INCLUDES_%s' % name.upper()] = include conf.env['LIBPATH_%s' % name.upper()] = libpath else: conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True) @@ -410,10 +410,11 @@ def build(bld): bld.recurse('platform/osx') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: - bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r) + bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r) if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/splash.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') bld.add_post_fun(post)