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:42:35 +0800 |
| commit | b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa (patch) | |
| tree | b0ff706680a8577e93f71d0945c4c8b58b05660f | |
| parent | 042e90eebca380686bbcc24d6803305b9d2c7823 (diff) | |
| download | glibmm-b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa.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 6933505d..16d57810 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 b7c7f77e..a2ee5ef3 100644 --- a/meson.build +++ b/meson.build @@ -231,7 +231,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' |