Skip to content

Commit a87f8fd

Browse files
committed
patch 8.1.0408: MSVC: cannot use the "x64" native compiler option
Problem: MSVC: cannot use the "x64" native compiler option. Solution: Ignore case for %Platform%. Improve documentation. (Ken Takata)
1 parent fe15b7d commit a87f8fd

3 files changed

Lines changed: 31 additions & 9 deletions

File tree

src/INSTALLpc.txt

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ INSTALLpc.txt - Installation of Vim on PC
33
This file contains instructions for compiling Vim. If you already have an
44
executable version of Vim, you don't need this.
55

6-
You can find the lastest here: https://github.com/vim/vim-win32-installer
6+
You can find the latest here: https://github.com/vim/vim-win32-installer
77
This page also has links to install support for interfaces such as Perl,
88
Python, Lua, etc.
99

@@ -164,6 +164,11 @@ options:
164164
msvc2015
165165
For x64 builds run this with the "x86_amd64" option:
166166
msvc2015 x86_amd64
167+
This enables x86_x64 cross compiler. This works on any editions including
168+
Express edition.
169+
If you use Community (or Professional) edition, you can enable the x64 native
170+
compiler by using the "x64" option:
171+
msvc2015 x64
167172

168173
The following Visual C++ team blog can serve as a reference page:
169174
http://blogs.msdn.com/b/vcblog/archive/2012/10/08/windows-xp-targeting-with-c-in-visual-studio-2012.aspx
@@ -182,7 +187,7 @@ Visual C++ Toolkit 2003 *msvc-2003-toolkit*
182187

183188
You could download the Microsoft Visual C++ Toolkit 2003 from
184189
http://msdn.microsoft.com/visualc/vctoolkit2003/
185-
Unfortunately this URL is no longer valid. Inofficial downloads appear to be
190+
Unfortunately this URL is no longer valid. Unofficial downloads appear to be
186191
available from links mentioned on these pages (use at your own risk):
187192
http://www.filewatcher.com/m/VCToolkitSetup.exe.32952488.0.0.html
188193
http://feargame.net/wiki/index.php?title=Building_Source_with_the_VC2003_Toolkit
@@ -276,12 +281,12 @@ Download an installer:
276281

277282
Execute the installer and follow the instructions to update basic packages.
278283
At the end keep the checkbox checked to run msys2 now. If needed, you can
279-
open the window from the start menu, MSYS2 64 bit / MSYS2 MSYS
284+
open the window from the start menu, MSYS2 64 bit / MSYS2 MSYS.
280285

281286
Execute:
282287
$ pacman -Syu
283-
284-
And restart MSYS2 window (select "MSYS2 MSYS" icon from the Start Menu).
288+
289+
And restart MSYS2 console (select "MSYS2 MSYS" icon from the Start Menu).
285290
Then execute:
286291
$ pacman -Su
287292

@@ -297,6 +302,7 @@ The following package groups are required for building Vim:
297302
* mingw-w64-i686-toolchain (for building 32-bit Vim)
298303
* mingw-w64-x86_64-toolchain (for building 64-bit Vim)
299304

305+
(These groups also include some useful packages which are not used by Vim.)
300306
Use the following command to install them:
301307

302308
$ pacman -S base-devel mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain
@@ -305,8 +311,18 @@ Or you can use the `pacboy` command to avoid long package names:
305311

306312
$ pacboy -S base-devel: toolchain:m
307313

314+
The suffix ":" means that it disables the package name translation.
315+
The suffix ":m" means both i686 and x86_64. You can also use the ":i" suffix
316+
to install only i686, and the ":x" suffix to install only x86_64.
308317
(See `pacboy help` for the help.)
309318

319+
See also the pacman page in ArchWiki for the general usage of pacman:
320+
https://wiki.archlinux.org/index.php/pacman
321+
322+
MSYS2 has its own git package, and you can also install it via pacman:
323+
324+
$ pacman -S git
325+
310326

311327
2.3. Keep the build environment up-to-date
312328

@@ -316,7 +332,7 @@ In that case, you just need to execute the command:
316332
$ pacman -Syu
317333

318334

319-
# Build Vim
335+
2.4. Build Vim
320336

321337
Select one of the following icon from the Start Menu:
322338

@@ -329,12 +345,12 @@ Go to the source directory of Vim, then execute the make command. E.g.:
329345
make -f Make_ming.mak GUI=no
330346
make -f Make_ming.mak GUI=no DEBUG=yes
331347

332-
NOTE: you can't execute the vim.exe in the MSYS console, open a normal Windows
348+
NOTE: you can't execute vim.exe in the MSYS2 console, open a normal Windows
333349
console for that. You need to set $PATH to be able to build there, e.g.:
334350

335351
set PATH=c:\msys64\mingw32\bin;c:\msys64\usr\bin;%PATH%
336352

337-
This command is in msys32.bat. Or or the 64 bit compiler use msys64.bat:
353+
This command is in msys32.bat. Or for the 64 bit compiler use msys64.bat:
338354

339355
set PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;%PATH%
340356

src/msvc2015.bat

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ rem For x86 builds run this without options:
77
rem msvc2015
88
rem For x64 builds run this with "x86_amd64" option:
99
rem msvc2015 x86_amd64
10+
rem This works on any editions including Express edition.
11+
rem If you use Community (or Professional) edition, you can also use "x64"
12+
rem option:
13+
rem msvc2015 x64
1014
@echo on
1115

1216
call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %*
@@ -23,7 +27,7 @@ if not exist "%WinSdk71%" (
2327
)
2428

2529
set INCLUDE=%WinSdk71%\Include;%INCLUDE%
26-
if "%Platform%"=="x64" (
30+
if /i "%Platform%"=="x64" (
2731
set "LIB=%WinSdk71%\Lib\x64;%LIB%"
2832
set SUBSYSTEM_VER=5.02
2933
) else (

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,8 @@ static char *(features[]) =
794794

795795
static int included_patches[] =
796796
{ /* Add new patch number below this line */
797+
/**/
798+
408,
797799
/**/
798800
407,
799801
/**/

0 commit comments

Comments
 (0)