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

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

commit 091892727fb2cd090f5586a80d2b9f5fbfbd794a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Feb 27 17:44:16 2020 +0800

    NMake Makefiles: Support using Meson-built dependencies
    
    Add NMake commandline option to use Meson-built libraries so that one will not
    need to update the Makefiles to use them.

 MSVC_NMake/config-msvc.mak | 13 ++++++++++---
 README.win32               |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index c2b7eaf..8ffbd3a 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -51,16 +51,23 @@ PANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLUDES
 # We build pangomm-vc$(PDBVER)0-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll or
 #          pangomm-vc$(PDBVER)0-d-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll at least
 
+!ifdef USE_MESON_LIBS
+LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
+!else
+LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
+!endif
+
+LIBSIGC_LIB = $(LIBSIGC_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)
-LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
 
 GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
-LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
-LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 
 PANGOMM_LIBNAME = pangomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
 
diff --git a/README.win32 b/README.win32
index f3ffed0..74ad91e 100644
--- a/README.win32
+++ b/README.win32
@@ -54,7 +54,9 @@ $(srcroot)\..\vsX\$(Platform) by default, where X is 12 for Visual
 Studio 2013, and 14 for later versions of Visual Studio.  Run
 'nmake /f Makefile.vc CFG=[release|debug]' to build pangomm.  If a
 different $(PREFIX) is desired rather than the aforementioned default,
-pass in PREFIX=$(PATH) into your command line.
+pass in PREFIX=$(PATH) into your command line.  If using C++
+dependencies that are built with Meson, specify USE_MESON_LIBS=1 in your
+NMake command line.
 
 A 'clean' target is supported to remove all the built object files and
 intermediate files that are generated during the build, while an