From 1e9f5d6392f3d82dafa17fff1d8c30b98c597933 Mon Sep 17 00:00:00 2001 From: Loic Le Page Date: Mon, 24 Jan 2022 09:45:51 +0100 Subject: [PATCH 1/2] Update subproject pcre.wrap to last version Last pcre.wrap version cleans up warnings on Windows builds. --- subprojects/pcre.wrap | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/subprojects/pcre.wrap b/subprojects/pcre.wrap index 065d22246..a6b07b961 100644 --- a/subprojects/pcre.wrap +++ b/subprojects/pcre.wrap @@ -3,10 +3,9 @@ directory = pcre-8.37 source_url = https://sourceforge.net/projects/pcre/files/pcre/8.37/pcre-8.37.tar.bz2 source_filename = pcre-8.37.tar.bz2 source_hash = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d -patch_filename = pcre_8.37-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/pcre_8.37-2/get_patch -patch_hash = 6b80f72385e1bf06721e26fbc83aced576e9c0d3182d86a55dd173a04050fe26 +patch_filename = pcre_8.37-4_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/pcre_8.37-4/get_patch +patch_hash = c957f42da6f6378300eb8a18f4a5cccdb8e2aada51a703cac842982f9f785399 [provide] libpcre = pcre_dep - From 258775a1a6ade6ea2e983828a0481e3bd3ad7e0f Mon Sep 17 00:00:00 2001 From: Loic Le Page Date: Tue, 18 Jan 2022 21:37:01 +0100 Subject: [PATCH 2/2] Hide non-fatal level-4 warnings and repetitions during build --- meson.build | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 02f49c228..c79084ac4 100644 --- a/meson.build +++ b/meson.build @@ -24,8 +24,25 @@ if cc.get_id() == 'msvc' # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once # NOTE: Only add warnings here if you are sure they're spurious - add_project_arguments('/wd4035', '/wd4715', '/wd4116', - '/wd4046', '/wd4068', '/wo4090',language : 'c') + add_project_arguments(cc.get_supported_arguments([ + '/wo4057', # 'operator': 'identifier1' differs in indirection to slightly different base types from 'identifier2' + '/wd4068', # unknown pragma + '/wo4090', # 'operation': different 'modifier' qualifiers + '/wd4100', # 'identifier': unreferenced formal parameter + '/wd4116', # unnamed type definition in parentheses + '/wo4125', # decimal digit terminates octal escape sequence + '/wd4127', # conditional expression is constant + '/wd4146', # unary minus operator applied to unsigned type, result still unsigned + '/wd4152', # nonstandard extension, function/data pointer conversion in expression + '/wd4201', # nonstandard extension used: nameless struct/union + '/wd4232', # nonstandard extension used: 'identifier': address of dllimport 'dllimport' is not static, identity not guaranteed + '/wo4245', # 'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch + '/wo4267', # 'variable': conversion from 'size_t' to 'type', possible loss of data + '/wd4334', # 'shift_operator': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + '/wo4389', # 'operator': signed/unsigned mismatch + '/wo4702', # unreachable code + '/wd4706' # assignment within conditional expression + ]), language : 'c') # Set the input and exec encoding to utf-8, like is the default with GCC add_project_arguments(cc.get_supported_arguments(['/utf-8']), language: 'c') # Disable SAFESEH with MSVC for plugins and libs that use external deps that