X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fc17894b44246f74d42b0ad8b47f91ae425814a2;hb=334853a13887b4a45445f786e72bb3b623c5c643;hp=5ea0b82f2bd1963d1f920e4e08dd914e8ca1f6fc;hpb=c225f8c74701a0b584c7f9862b7e51d42535e51f;p=dcpomatic.git diff --git a/wscript b/wscript index 5ea0b82f2..fc17894b4 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.32devel' +VERSION = '2.1.42devel' 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)