From fa8f861957f4f9f7a0946d9d61fe90a9882f54e6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 24 May 2019 17:05:44 +0200 Subject: [PATCH] patch 8.1.1380: MS-Windows building VIMDLL with MSVC: SUBSYSTEM is not set Problem: MS-Windows building VIMDLL with MSVC: SUBSYSTEM is not set. Solution: Invert condition. (closes #4422) --- src/Make_mvc.mak | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 89f4e13fb..4981539b9 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -847,7 +847,7 @@ XDIFF_DEPS = \ !if "$(SUBSYSTEM_VER)" != "" SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) SUBSYSTEM_TOOLS = $(SUBSYSTEM_TOOLS),$(SUBSYSTEM_VER) -! if "$(VIMDLL)" != "yes" +! if "$(VIMDLL)" == "yes" SUBSYSTEM_CON = $(SUBSYSTEM_CON),$(SUBSYSTEM_VER) ! endif # Pass SUBSYSTEM_VER to GvimExt and other tools diff --git a/src/version.c b/src/version.c index 60e6c82f4..f7fb44e6e 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1380, /**/ 1379, /**/