diff options
Diffstat (limited to 'MSVC_NMake/config-msvc.mak')
| -rw-r--r-- | MSVC_NMake/config-msvc.mak | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak index 2985437..878fddb 100644 --- a/MSVC_NMake/config-msvc.mak +++ b/MSVC_NMake/config-msvc.mak @@ -9,9 +9,9 @@ LIBSIGC_MAJOR_VERSION = 3 LIBSIGC_MINOR_VERSION = 0 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug" -LIBSIGC_DEBUG_SUFFIX = -d +DEBUG_SUFFIX = -d !else -LIBSIGC_DEBUG_SUFFIX = +DEBUG_SUFFIX = !endif LIBSIGCPP_DEFINES = /DSIGC_BUILD /D_WINDLL @@ -27,9 +27,15 @@ LIBSIGCPP_CFLAGS = $(SIGCPP_CFLAGS) $(LIBSIGCPP_DEFINES) # We build sigc-vc$(VSVER_LIB)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION).dll or # sigc-vc$(VSVER_LIB)d-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION).dll at least -LIBSIGC_LIBNAME = sigc-vc$(VSVER_LIB)$(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$(VSVER_LIB)$(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 # If your Boost libraries are built as DLLs, use BOOST_DLL=1 in your NMake command line |