adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1499: MS-Windows: no indication of ARM64 architecture

Browse Source 
Problem:  MS-Windows: no indication of ARM64 architecture
Solution: Add ARM64 to version output and include in nsis installer
          (RestorerZ)

related: vim/vim-win32-installer#381
closes: #17642

Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
RestorerZ
2025-07-01 21:30:21 +02:00
committed by Christian Brabandt
parent 523f9f5898
commit 54585fd04c
6 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Make_mvc.mak
View File

@ -342,7 +342,11 @@ MSVCRT_NAME = vcruntime$(MSVCRT_VER)
### Set the default $(WINVER) to make it work with Windows 7
!ifndef WINVER
! if "$(CPU)" == "ARM64"
WINVER = 0x0A00
! else
WINVER = 0x0601
! endif
!endif
# Use multiprocess build
@ -571,7 +575,8 @@ CPUNR = sse2
! error *** ERROR Unknown target architecture "$(CPUNR)". Make aborted.
! endif
!elseif "$(CPU)" == "ARM64"
# TODO: Validate CPUNR.
# TODO: Validate CPUNR depending on the VS version.
CPUNR = armv8.0
!endif
# Convert processor ID to MVC-compatible number

18
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1499,
/**/
1498,
/**/
@ -3926,13 +3928,21 @@ list_version(void)
# ifdef FEAT_GUI_MSWIN
# ifdef VIMDLL
# ifdef _WIN64
msg_puts(_("\nMS-Windows 64-bit GUI/console version"));
# if defined(_M_ARM64) || defined(_M_ARM64EC)
msg_puts(_("\nMS-Windows ARM64 GUI/console version"));
# else
msg_puts(_("\nMS-Windows 64-bit GUI/console version"));
# endif
# else
msg_puts(_("\nMS-Windows 32-bit GUI/console version"));
# endif
# else
# ifdef _WIN64
msg_puts(_("\nMS-Windows 64-bit GUI version"));
# if defined(_M_ARM64) || defined(_M_ARM64EC)
msg_puts(_("\nMS-Windows ARM64 GUI version"));
# else
msg_puts(_("\nMS-Windows 64-bit GUI version"));
# endif
# else
msg_puts(_("\nMS-Windows 32-bit GUI version"));
# endif
@ -3942,7 +3952,11 @@ list_version(void)
# endif
# else
# ifdef _WIN64
# if defined(_M_ARM64) || defined(_M_ARM64EC)
msg_puts(_("\nMS-Windows ARM64 console version"));
# else
msg_puts(_("\nMS-Windows 64-bit console version"));
# endif
# else
msg_puts(_("\nMS-Windows 32-bit console version"));
# endif