diff options
| author | K.Takata <kentkt@csc.jp> | 2022-11-10 23:17:19 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-10 23:17:19 +0000 |
| commit | 37f1030fd6e2092582893f438978384025c55328 (patch) | |
| tree | 74a76387bd90f791ea890a55e4130dca48035bb2 | |
| parent | d55bfcaa9b140c50cddf56a2c614f05f2f6f2533 (diff) | |
| download | vim-git-37f1030fd6e2092582893f438978384025c55328.tar.gz | |
patch 9.0.0857: selecting MSVC 2017 does not set $PLATFORMv9.0.0857
Problem: Selecting MSVC 2017 does not set $PLATFORM.
Solution: Use $VSCMD_ARG_TGT_ARCH. (Ken Takata, closes #11485)
| -rw-r--r-- | src/Make_mvc.mak | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 028277a10..639ae2f89 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -222,8 +222,12 @@ CPU = i386 ! endif ! else # !CPU CPU = i386 -! if !defined(PLATFORM) && defined(TARGET_CPU) +! ifndef PLATFORM +! ifdef TARGET_CPU PLATFORM = $(TARGET_CPU) +! elseif defined(VSCMD_ARG_TGT_ARCH) +PLATFORM = $(VSCMD_ARG_TGT_ARCH) +! endif ! endif ! ifdef PLATFORM ! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") diff --git a/src/version.c b/src/version.c index 50f6709b2..19f0692db 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 857, +/**/ 856, /**/ 855, |