NMake Makefiles: Use Meson-style DLL and .lib naming if requested

fanc999-1 · fanc999-1 · commit 6c076763bc86 · 2020-07-23T17:18:11.000+08:00
To make things more consistent and less prone to confusion, if 'USE_MESON_LIBS'
is specified in the NMake command line, build the DLLs and .lib's that are
named like the Meson counterparts.  Binaries built with Meson+Visual Studio
and the ones that are built via NMake using 'USE_MESON_LIBS' are
interchangeable.
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
@@ -9,9 +9,9 @@ LIBSIGC_MAJOR_VERSION = 2
 LIBSIGC_MINOR_VERSION = 0
 
 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug"
-LIBSIGC_DEBUG_SUFFIX = -d
+DEBUG_SUFFIX = -d
 !else
-LIBSIGC_DEBUG_SUFFIX =
+DEBUG_SUFFIX =
 !endif
 
 !ifndef M4
@@ -34,9 +34,15 @@ LIBSIGCPP_CFLAGS = $(SIGCPP_CFLAGS) $(LIBSIGCPP_DEFINES)
 # We build sigc-vc$(PDBVER)0-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION).dll or
 #          sigc-vc$(PDBVER)0d-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION).dll at least
 
-LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(LIBSIGC_DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+!ifdef USE_MESON_LIBS
+LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
+LIBSIGC_DLLNAME = $(LIBSIGC_LIBNAME)-0
+!else
+LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+LIBSIGC_DLLNAME = $(LIBSIGC_LIBNAME)
+!endif
 
-LIBSIGC_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(LIBSIGC_LIBNAME).dll
+LIBSIGC_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(LIBSIGC_DLLNAME).dll
 LIBSIGC_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(LIBSIGC_LIBNAME).lib
 
 # Note that building the benchmark requires Boost!
