diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-11-09 14:28:14 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-11-09 14:28:14 +0800 |
commit | 7ca8945b48a87875d1a46bb5c2a2b45a570253d0 (patch) | |
tree | 483a4eaf0a0d7d3d485e5236c5274880e1d90b59 | |
parent | 7d6cb3ed9dd1366c6595ea56d4d4481887749aa6 (diff) | |
download | glibmm-7ca8945b48a87875d1a46bb5c2a2b45a570253d0.tar.gz |
Build: Support VS2022 builds
Make these builds distinct from the Visual Studio 2019 builds.
-rw-r--r-- | MSVC_NMake/detectenv-msvc.mak | 5 | ||||
-rw-r--r-- | meson.build | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak index f2fa09cf..d2f3144b 100644 --- a/MSVC_NMake/detectenv-msvc.mak +++ b/MSVC_NMake/detectenv-msvc.mak @@ -98,9 +98,12 @@ PDBVER = 14 !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 VSVER_SUFFIX = 1 VSVER = 15 -!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 +!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 VSVER_SUFFIX = 2 VSVER = 16 +!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 +VSVER_SUFFIX = 3 +VSVER = 17 !else VSVER = $(PDBVER) !endif diff --git a/meson.build b/meson.build index b3c21a6e..69717917 100644 --- a/meson.build +++ b/meson.build @@ -219,7 +219,9 @@ if is_msvc add_project_arguments(disabled_warnings, language: 'cpp') if use_msvc14x_toolset_ver - if cpp_compiler.version().version_compare('>=19.20') + if cpp_compiler.version().version_compare('>=19.30') + msvc14x_toolset_ver = '-vc143' + elif cpp_compiler.version().version_compare('>=19.20') msvc14x_toolset_ver = '-vc142' elif cpp_compiler.version().version_compare('>=19.10') msvc14x_toolset_ver = '-vc141' |