[gtkmm/gtkmm-3-24] NMake Makefiles: Apply toolset version for Meson-built deps

[Chun-wei Fan <fanchunwei src gnome org>]

commit b79534e2b023b182b3966310a4e5ecbfe8f73f3e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 30 14:42:39 2020 +0800

    NMake Makefiles: Apply toolset version for Meson-built deps
    
    As the Meson build files for Visual Studio apply the toolset version in the
    .lib filenames by default, apply the toolset version in the Meson-built -mm
    .lib files that we link in, just as we did when we we link in the -mm .lib
    files that was built with NMake, by default.
    
    The option 'USE_COMPAT_LIBS' will also mean that we will use the former
    behavior when we link in the Meson-built -mm .lib's, just as we did when we
    link in the NMake-built -mm .lib's.

 MSVC_NMake/config-msvc.mak    | 18 +++++++++++++-----
 MSVC_NMake/detectenv-msvc.mak |  6 ------
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 98824852..49b51835 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -167,13 +167,21 @@ GTKMM_DEMO_CFLAGS = $(GTKMM_DEMO_CFLAGS:/EHsc=)
 #          gtkmm-vc$(VSVER_LIB)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll or
 #          gtkmm-vc$(VSVER_LIB)-d-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll at least
 
+!if $(VSVER) > 14 && "$(USE_COMPAT_LIBS)" != ""
+VSVER_LIB = $(PDBVER)0
+MESON_VERVER_LIB =
+!else
+VSVER_LIB = $(PDBVER)$(VSVER_SUFFIX)
+MESON_VERVER_LIB = -vc$(VSVER_LIB)
+!endif
+
 !ifdef USE_MESON_LIBS
 LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
-GLIBMM_LIBNAME = glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
-GIOMM_LIBNAME = giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
-CAIROMM_LIBNAME = cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
-PANGOMM_LIBNAME = pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)
-ATKMM_LIBNAME = atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm$(MESON_VERVER_LIB)-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+GIOMM_LIBNAME = giomm$(MESON_VERVER_LIB)-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+CAIROMM_LIBNAME = cairomm$(MESON_VERVER_LIB)-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
+PANGOMM_LIBNAME = pangomm$(MESON_VERVER_LIB)-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)
+ATKMM_LIBNAME = atkmm$(MESON_VERVER_LIB)-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)
 
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 38bc704a..c854d236 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -106,12 +106,6 @@ VSVER = $(PDBVER)
 VSVER = $(PDBVER)
 !endif
 
-!if $(VSVER) > 14 && "$(USE_COMPAT_LIBS)" != ""
-VSVER_LIB = $(PDBVER)0
-!else
-VSVER_LIB = $(PDBVER)$(VSVER_SUFFIX)
-!endif
-
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^