[gtkmm/gtkmm-3-24] NMake Makefiles: Allow linking to more Meson-built items



commit 44d6a142c0288e54215958ba52c369329ff38df8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed May 6 18:16:43 2020 +0800

    NMake Makefiles: Allow linking to more Meson-built items
    
    atkmm and cairomm recently gained Meson build files, so add their libary
    and DLL names to the NMake Makefiles so that we can easily link to them
    when we use USE_MESON_LIBS in the NMake command line.

 MSVC_NMake/config-msvc.mak | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 2b22ca4e..9dce22d4 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -163,37 +163,37 @@ GTKMM_DEMO_CFLAGS = $(GTKMM_DEMO_CFLAGS:/EHsc=)
 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)
+CAIROMM_LIBNAME = cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
 PANGOMM_LIBNAME = pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)
+ATKMM_LIBNAME = atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)
 
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
 GIOMM_DLL = $(GIOMM_LIBNAME)-1.dll
+CAIROMM_DLL = $(CAIROMM_LIBNAME)-1.dll
 PANGOMM_DLL = $(PANGOMM_LIBNAME)-1.dll
+ATKMM_DLL = $(ATKMM_LIBNAME)-1.dll
 !else
 LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
 GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 GIOMM_LIBNAME = giomm-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)
 PANGOMM_LIBNAME = pangomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
+ATKMM_LIBNAME = atkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
 
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 GIOMM_DLL = $(GIOMM_LIBNAME).dll
+CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 PANGOMM_DLL = $(PANGOMM_LIBNAME).dll
+ATKMM_DLL = $(ATKMM_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)
-
-CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
-
-ATKMM_LIBNAME = atkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
-
-ATKMM_DLL = $(ATKMM_LIBNAME).dll
+PANGOMM_LIB = $(PANGOMM_LIBNAME).lib
 ATKMM_LIB = $(ATKMM_LIBNAME).lib
 
 GDKMM_LIBNAME = gdkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]