diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-24 17:05:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-24 17:05:44 +0200 |
| commit | fa8f861957f4f9f7a0946d9d61fe90a9882f54e6 (patch) | |
| tree | f045b4a9983d4fe20519bc2cf4e41dc1943b488d /src | |
| parent | 8239c62067c8d40720560496b25a82662126f2a2 (diff) | |
patch 8.1.1380: MS-Windows building VIMDLL with MSVC: SUBSYSTEM is not setv8.1.1380
Problem: MS-Windows building VIMDLL with MSVC: SUBSYSTEM is not set.
Solution: Invert condition. (closes #4422)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_mvc.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 89f4e13fbb..4981539b91 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 60e6c82f41..f7fb44e6e8 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1380, +/**/ 1379, /**/ 1378, |