[glibmm/glibmm-2-62] NMake Makefiles: Add USE_MESON_LIBS

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

commit 7e6a78446ddbcbbda086457362c705616d98590d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Dec 26 17:56:22 2019 +0800

    NMake Makefiles: Add USE_MESON_LIBS
    
    This makes it easier for builds that use C++ dependencies that are built
    with Meson, where applicable.

 MSVC_NMake/config-msvc.mak | 7 ++++++-
 MSVC_NMake/info-msvc.mak   | 7 +++++--
 README.win32               | 4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 73fda638..5d1fe279 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -42,9 +42,14 @@ GIOMM_EX_CFLAGS = $(GIOMM_BASE_CFLAGS) $(GLIBMM_EXTRA_INCLUDES)
 #          giomm-vc$(PDBVER)0-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION).dll or
 #          giomm-vc$(PDBVER)0-d-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_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$(PDBVER)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)
diff --git a/MSVC_NMake/info-msvc.mak b/MSVC_NMake/info-msvc.mak
index 25902e57..6b963109 100644
--- a/MSVC_NMake/info-msvc.mak
+++ b/MSVC_NMake/info-msvc.mak
@@ -10,9 +10,9 @@ all-build-info:
 help:
        @echo.
        @echo ============================
-       @echo Building cairomm Using NMake
+       @echo Building glibmm Using NMake
        @echo ============================
-       @echo nmake /f Makefile.vc CFG=[release^|debug] ^<PREFIX=PATH^> <option1=xxx option2=xxx>
+       @echo nmake /f Makefile.vc CFG=[release^|debug] ^<PREFIX=PATH^> ^<option1=xxx option2=xxx^>
        @echo.
        @echo Where:
        @echo ------
@@ -30,6 +30,9 @@ help:
        @echo GLIB_COMPILE_SCHEMAS: Location of the glib-compile-schemas tool,
        @echo if it cannot be found in $(PREFIX)\bin.  This tool is needed for the
        @echo giomm settings example program.
+       @echo.
+       @echo USE_MESON_LIBS: Use DLLs and LIBs of C++ dependencies that are built with Meson,
+       @echo as applicable.
        @echo ======
        @echo A 'clean' target is supported to remove all generated files, intermediate
        @echo object files and binaries for the specified configuration.
diff --git a/README.win32 b/README.win32
index 7a11f81a..929858db 100644
--- a/README.win32
+++ b/README.win32
@@ -53,7 +53,9 @@ giomm DLLs, along with their example programs.  If a prefix other than
 $(srcroot)\..\vs$(VSVER)\$(Platform) is desired, pass in PREFIX=$(your_prefix)
 in the NMake command line.  In order to build the giomm settings example
 program, the glib-compile-schemas needs to reside in $(PREFIX)\bin, or
-it must be specified via passing in GLIB_COMPILE_SCHEMAS.
+it must be specified via passing in GLIB_COMPILE_SCHEMAS.  If you are using
+C++ dependencies that are built with Meson, specify USE_MESON_LIBS=1 in
+your NMake command line.
 
 Note that $(VSVER) refers to 14 for Visual Studio 2015 and 15 for Visual
 Studio 2017.