[atkmm/atkmm-2-28] MSVC_NMake: Add option to link to Meson-built libraries



commit a7200534fedd7c8f7409e997ecdb619482045d89
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Feb 7 18:49:17 2020 +0800

    MSVC_NMake: Add option to link to Meson-built libraries
    
    libsigc++ is now buildable with Meson, so make it easier for people to
    link to Meson-built libsigc++ libraries with a NMake command line
    option.

 MSVC_NMake/config-msvc.mak | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 9a019ef..04b9130 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -46,11 +46,17 @@ ATKMM_CFLAGS = /DATKMM_BUILD $(ATKMM_BASE_CFLAGS) $(ATKMM_EXTRA_INCLUDES)
 #          atkmm-vc$(PDBVER)0-d-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION).dll at least
 
 GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
+
+!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
 
 GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
-LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
 LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 
 ATKMM_LIBNAME = atkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)


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