X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=7f262bf81f8a8ed88f1964ef9468bea37a72d879;hb=10637d3694aac941c022081166c4956a5d0b28f1;hp=dc7864cc343b020d39c9f3cb822b3089585538a2;hpb=ad1a4f3ac68a0f35a911abee4eb2bd4b4006332d;p=dcpomatic.git diff --git a/cscript b/cscript index dc7864cc3..7f262bf81 100644 --- a/cscript +++ b/cscript @@ -324,7 +324,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f) for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', - 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'ko_KR']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) @@ -365,7 +365,7 @@ def dependencies(target, options): if target.platform == 'windows' and target.version == 'xp': deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)] elif target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '7427ffe', ffmpeg_options)] + deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] @@ -375,8 +375,8 @@ def dependencies(target, options): (target.platform == 'osx' and target.bits == 64) or (target.platform == 'windows')) else {} - deps.append(('libdcp', '4e885dc', cpp_lib_options)) - deps.append(('libsub', 'ef8f8ac', cpp_lib_options)) + deps.append(('libdcp', '9a8faac', cpp_lib_options)) + deps.append(('libsub', '8da829d', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we @@ -392,7 +392,7 @@ def dependencies(target, options): option_defaults = { "gui": True, "variant": None } def configure_options(target, options): - opt = '' + opt = ' --warnings-are-errors' if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'): # Currently we only build tests on Ubuntu 18.04 @@ -550,9 +550,7 @@ def build(target, options): else: target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options))) target.command('./waf') - - if target.platform == 'linux' or target.platform == 'osx': - target.command('./waf install') + target.command('./waf install') def package_windows(target): identifier = ''