[pangomm/pangomm-2-42] NMake Makefiles: Fix previous commit
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm/pangomm-2-42] NMake Makefiles: Fix previous commit
- Date: Tue, 30 Jun 2020 09:02:45 +0000 (UTC)
commit bd47ac36582a9816f66dc088dd8fb96f92357921
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jun 30 17:02:23 2020 +0800
NMake Makefiles: Fix previous commit
We should also account for Visual Studio 2015 when we use 'USE_MESON_LIBS' with
'USE_COMPAT_LIBS' as well...
MSVC_NMake/config-msvc.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 4f5b0d6..a8cef21 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -55,7 +55,7 @@ PANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLUDES
# We build pangomm-vc$(VSVER_LIB)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll or
# pangomm-vc$(VSVER_LIB)-d-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll at least
-!if $(VSVER) > 14 && "$(USE_COMPAT_LIBS)" != ""
+!if "$(USE_COMPAT_LIBS)" != ""
VSVER_LIB = $(PDBVER)0
MESON_VSVER_LIB =
!else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]