[gtkmm/gtkmm-3-24] NMake Makefiles: Support linking to Meson-built -mm deps

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

commit 00974a49875ab328d27115f402a05495e19395ac
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Apr 8 18:57:11 2020 +0800

    NMake Makefiles: Support linking to Meson-built -mm deps
    
    This makes it easier for people that want to build dependencies with
    Meson as far as possible, by adding an USE_MESON_LIBS NMake option.
    
    Note that by using USE_MESON_LIBS at this time of writing, libsigc++,
    glibmm and pangomm should be built by Meson, and atkmm and cairomm
    should also link to the Meson-built variants of glibmm and libsigc++ as
    well (as atkmm and cairomm do not yet have Meson build files).

 MSVC_NMake/config-msvc.mak | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 5b730122..652fe5b2 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -154,20 +154,32 @@ GTKMM_DEMO_CFLAGS =       \
 #          gtkmm-vc$(PDBVER)0-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll or
 #          gtkmm-vc$(PDBVER)0-d-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll at least
 
+!ifdef USE_MESON_LIBS
+LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+GIOMM_LIBNAME = giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+PANGOMM_LIBNAME = pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)
+
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
+GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
+GIOMM_DLL = $(GIOMM_LIBNAME)-1.dll
+PANGOMM_DLL = $(PANGOMM_LIBNAME)-1.dll
+!else
 LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
-
-LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
-LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
-
 GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
-
-GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
-GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
-
 GIOMM_LIBNAME = giomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
+PANGOMM_LIBNAME = pangomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
 
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
+GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 GIOMM_DLL = $(GIOMM_LIBNAME).dll
+PANGOMM_DLL = $(PANGOMM_LIBNAME).dll
+!endif
+
+LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
+GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 GIOMM_LIB = $(GIOMM_LIBNAME).lib
+PANGOMM_LIB = $(PANGOMM_LIBNAME).lib
 
 CAIROMM_LIBNAME = cairomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
 
@@ -179,11 +191,6 @@ ATKMM_LIBNAME = atkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM
 ATKMM_DLL = $(ATKMM_LIBNAME).dll
 ATKMM_LIB = $(ATKMM_LIBNAME).lib
 
-PANGOMM_LIBNAME = pangomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
-
-PANGOMM_DLL = $(PANGOMM_LIBNAME).dll
-PANGOMM_LIB = $(PANGOMM_LIBNAME).lib
-
 GDKMM_LIBNAME = gdkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
 
 GDKMM_DLL = vs$(PDBVER)\$(CFG)\$(PLAT)\$(GDKMM_LIBNAME).dll