[pangomm/cairomm-meson-improvements: 1/3] NMake Makefiles: Support Meson-built cairomm

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

commit f2ca60060e5aaedf26742d71ce071e5541198ad5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 5 15:16:12 2020 +0800

    NMake Makefiles: Support Meson-built cairomm
    
    Allow linking directly to Meson-built cairomm when using the
    USE_MESON_LIBS option when running NMake.

 MSVC_NMake/config-msvc.mak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 5451f0a..736f2c9 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -54,21 +54,21 @@ LIBPANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLU
 !ifdef USE_MESON_LIBS
 LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
 GLIBMM_LIBNAME = glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+CAIROMM_LIBNAME = cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
+CAIROMM_DLL = $(CAIROMM_LIBNAME)-1.dll
 !else
 LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
 GLIBMM_LIBNAME = glibmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
+CAIROMM_LIBNAME = cairomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
+CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 !endif
 
 LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
-
-CAIROMM_LIBNAME = cairomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
-
-CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
 
 PANGOMM_LIBNAME = pangomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)