[pangomm/pangomm-2-42] NMake Makefiles: Support Meson-built glibmm

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

commit efd43c78d44a2d7f94e492fc3bc30a0528f45168
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 12 19:15:29 2020 +0800

    NMake Makefiles: Support Meson-built glibmm
    
    Add the correct naming for the DLLs and .lib's for glibmm that is built
    with Meson.

 MSVC_NMake/config-msvc.mak | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 8ffbd3a..24dfbbe 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -53,19 +53,21 @@ PANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLUDES
 
 !ifdef USE_MESON_LIBS
 LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
+GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
 !else
-LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
+GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 !endif
 
 LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
+GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 
-GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 CAIROMM_LIBNAME = cairomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
 
-GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
-GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib