diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-09 15:14:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-09 15:14:08 +0100 |
| commit | 92cafb6fc686a041354da2eabde6bcb2f6846e1d (patch) | |
| tree | cdc26dde96d8c9ed1e9c60056a404ca3df2dcfac /wscript | |
| parent | fd040c2bd27fde35424a384174ecb56c643764cd (diff) | |
| parent | 6e5c4e570f26e05124ab0ef67e39c07bab9cb4d5 (diff) | |
Merge master.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -55,7 +55,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.45', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.49', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) @@ -232,7 +232,13 @@ def build(bld): obj.target = 'dcpomatic.desktop' obj.dict = d - bld.install_files('${PREFIX}/share/applications', 'dcpomatic.desktop') + obj = bld(features = 'subst') + obj.source = 'dcpomatic_batch.desktop.in' + obj.target = 'dcpomatic_batch.desktop' + obj.dict = d + + bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop']) + for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r) |