[pangomm] NMake Makefiles: Apply toolset version for Meson-built deps

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

commit 6f847d738c4489f79b190bcb0c1a61a45bc00ce9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 30 15:28:44 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.
    
    Also fix the case also when the 'USE_COMPAT_LIBS' option is used and when
    'USE_MESON_LIBS' is not used on Visual Studio 2017, where the toolset version
    was not correctly applied.

 MSVC_NMake/config-msvc.mak    | 12 ++++++++++--
 MSVC_NMake/detectenv-msvc.mak | 10 ----------
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index ddd1c68..c535894 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -51,10 +51,18 @@ LIBPANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLU
 # We build pangomm-vc$(VSVER_LIB)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll or
 #          pangomm-vc$(VSVER_LIB)-d-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll at least
 
+!if $(VSVER) > 14 && "$(USE_COMPAT_LIBS)" != ""
+VSVER_LIB = 150
+MESON_VSVER_LIB =
+!else
+VSVER_LIB = $(PDBVER)$(VSVER_SUFFIX)
+MESON_VSVER_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)
-CAIROMM_LIBNAME = cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm$(MESON_VSVER_LIB)-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+CAIROMM_LIBNAME = cairomm$(MESON_VSVER_LIB)-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
 CAIROMM_DLL = $(CAIROMM_LIBNAME)-1.dll
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index c687835..c854d23 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -106,16 +106,6 @@ VSVER = $(PDBVER)
 VSVER = $(PDBVER)
 !endif
 
-!if $(VSVER) > 14 && "$(USE_COMPAT_LIBS)" != ""
-!if $(VSVER) > 15
-VSVER_LIB = 150
-!else
-VSVER_LIB = $(PDBVER)0
-!endif
-!else
-VSVER_LIB = $(PDBVER)$(VSVER_SUFFIX)
-!endif
-
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^