[pangomm] NMake Makefiles: Link with giomm

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

commit 4c824b5f2d6956da952d575bc8ec2e8695556aea
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 22 10:08:19 2020 +0800

    NMake Makefiles: Link with giomm
    
    ...since we are now using items from giomm since commit 17021092, and ensure
    that we do indeed refer to the glibmm (giomm) master headers
    as we are using items from

 MSVC_NMake/config-msvc.mak | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 57916f6..158c8e1 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -37,6 +37,8 @@ PANGOMM_BASE_CFLAGS =                 \
 
 PANGOMM_EXTRA_INCLUDES =       \
        /I$(PREFIX)\include\pango-$(PANGO_API_VERSION)  \
+       /I$(PREFIX)\include\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)       \
+       /I$(PREFIX)\lib\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\include   \
        /I$(PREFIX)\include\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)      \
        /I$(PREFIX)\lib\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\include  \
        /I$(PREFIX)\include\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)   \
@@ -63,6 +65,7 @@ MESON_VSVER_LIB = -vc$(VSVER_LIB)
 
 !ifdef USE_MESON_LIBS
 LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
+GIOMM_LIBNAME = giomm$(MESON_VSVER_LIB)-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_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
@@ -70,6 +73,7 @@ GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
 CAIROMM_DLL = $(CAIROMM_LIBNAME)-1.dll
 !else
 LIBSIGC_LIBNAME = sigc-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+GIOMM_LIBNAME = giomm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 GLIBMM_LIBNAME = glibmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 CAIROMM_LIBNAME = cairomm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
@@ -78,6 +82,7 @@ CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 !endif
 
 LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
+GIOMM_LIB = $(GIOMM_LIBNAME).lib
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
 
@@ -89,4 +94,4 @@ PANGOMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).lib
 GOBJECT_LIBS = gobject-$(GLIB_API_VERSION).lib glib-$(GLIB_API_VERSION).lib
 CAIRO_LIB = cairo.lib
 PANGO_LIBS = pangocairo-$(PANGO_API_VERSION).lib pango-$(PANGO_API_VERSION).lib $(GOBJECT_LIBS) $(CAIRO_LIB)
-PANGOMM_DEP_LIBS = $(GLIBMM_LIB) $(CAIROMM_LIB) $(LIBSIGC_LIB) $(PANGO_LIBS)
+PANGOMM_DEP_LIBS = $(GIOMM_LIB) $(GLIBMM_LIB) $(CAIROMM_LIB) $(LIBSIGC_LIB) $(PANGO_LIBS)