[gtkmm/gtkmm-3-24] MSVC_NMake/config-msvc.mak: Use $(PDBVER) in DLL names



commit 7f5bc2b7538add42b4cc57189367dd4fd65735d1
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 25 18:10:50 2018 +0800

    MSVC_NMake/config-msvc.mak: Use $(PDBVER) in DLL names
    
    Since this is the C++-11 version of gtkmm which supports both Visual
    Studio 2015 and 2017, we want to name the DLL and .lib to be like
    <library>-vc140-3_0.[dll.lib] or <library>-vc140-d-3_0.[dll|lib] since
    they both link to the v140 Windows C/C++ runtime DLLs, and thus these
    DLLs and .lib's are advertised to be interoperable, as supported by
    Microsoft.
    
    Note that the master branch, which requires C++-17, is not changed
    as Visual Studio 2017 is really required to build things there.

 MSVC_NMake/config-msvc.mak | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index b00f4e76..0d7c52ac 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -138,47 +138,47 @@ GTKMM_DEMO_CFLAGS =       \
        $(GTKMM_BASE_CFLAGS)    \
        $(GTKMM_INCLUDES)
 
-# We build gdkmm-vc$(VSVER)0-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll or
-#          gdkmm-vc$(VSVER)0-d-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll at least
-#          gtkmm-vc$(VSVER)0-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll or
-#          gtkmm-vc$(VSVER)0-d-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll at least
+# We build gdkmm-vc$(PDBVER)0-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll or
+#          gdkmm-vc$(PDBVER)0-d-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll at least
+#          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
 
-LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+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$(VSVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
+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$(VSVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
+GIOMM_LIBNAME = giomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 
 GIOMM_DLL = $(GIOMM_LIBNAME).dll
 GIOMM_LIB = $(GIOMM_LIBNAME).lib
 
-CAIROMM_LIBNAME = cairomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
+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$(VSVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
+ATKMM_LIBNAME = atkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
 
 ATKMM_DLL = $(ATKMM_LIBNAME).dll
 ATKMM_LIB = $(ATKMM_LIBNAME).lib
 
-PANGOMM_LIBNAME = pangomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
+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$(VSVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
+GDKMM_LIBNAME = gdkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
 
 GDKMM_DLL = $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).dll
 GDKMM_LIB = $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).lib
 
-GTKMM_LIBNAME = gtkmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
+GTKMM_LIBNAME = gtkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
 
 GTKMM_DLL = $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).dll
 GTKMM_LIB = $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).lib


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