diff options
Diffstat (limited to 'MSVC_NMake/config-msvc.mak')
| -rw-r--r-- | MSVC_NMake/config-msvc.mak | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak index 0f217da..4735b47 100644 --- a/MSVC_NMake/config-msvc.mak +++ b/MSVC_NMake/config-msvc.mak @@ -45,20 +45,20 @@ CAIROMM_TEST_CFLAGS = \ CAIROMM_INT_SOURCES = $(cairomm_cc:/=\) CAIROMM_INT_HDRS = $(cairomm_public_h:/=\) -# We build cairomm-vc$(VSVER)0-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION).dll or -# cairomm-vc$(VSVER)0-d-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION).dll at least +# We build cairomm-vc$(VSVER_LIB)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION).dll or +# cairomm-vc$(VSVER_LIB)-d-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION).dll at least !ifdef USE_MESON_LIBS LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION) LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll !else -LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION) +LIBSIGC_LIBNAME = sigc-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION) LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll !endif LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib -CAIROMM_LIBNAME = cairomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION) +CAIROMM_LIBNAME = cairomm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION) CAIROMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).dll CAIROMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).lib |