Skip to content

Commit 3bf8c3c

Browse files
committed
patch 8.0.1268: PC install instructions are incomplete
Problem: PC install instructions are incomplete. Solution: Update the instructions. (Ken Takata)
1 parent 5842a74 commit 3bf8c3c

2 files changed

Lines changed: 62 additions & 24 deletions

File tree

src/INSTALLpc.txt

Lines changed: 60 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ XP/2003/Vista/7/8/10). There are also instructions for pre-XP systems, but
1616
they might no longer work.
1717

1818
The recommended way is to build a 32 bit Vim, also on 64 bit systems. You can
19-
build a 64 bit Vim if you like, the executable will be bigger and Vim wan't be
19+
build a 64 bit Vim if you like, the executable will be bigger and Vim won't be
2020
any faster, but you can edit files larger than 2 Gbyte.
2121

2222

@@ -42,7 +42,7 @@ Contents:
4242

4343
The currently recommended way (that means it has been verified to work) is
4444
using the "Visual Studio Community 2015" installation. This includes the SDK
45-
needed to target Windows XP. But not older Windows versions (95, 97), see
45+
needed to target Windows XP. But not older Windows versions (95, 98), see
4646
|msvc-2008-express| below for that
4747

4848

@@ -53,6 +53,10 @@ We do not provide download links, since Microsoft keeps changing them. You
5353
can search for "Visual Studio Community 2015", for example. You will need to
5454
create a Microsoft account (it's free).
5555

56+
When installing "Visual Studio Community 2015 with Update 3" make sure to
57+
select "custom" and check "Windows XP Support for C++" and all checkboxes
58+
under "Universal Windows App Development Tools"
59+
5660

5761
Visual Studio
5862
-------------
@@ -285,17 +289,11 @@ your AUTOEXEC.BAT file with a line like:
285289

286290
or on NT/2000/XP, go to the Control Panel, (Performance and Maintenance),
287291
System, Advanced, and edit the environment from there. If you use msys2
288-
compilers, set your installed paths:
289-
290-
C:\msys2\mingw32\bin
291-
or
292-
C:\msys64\mingw32\bin
293-
294-
for 32bit. And 64bit:
292+
compilers, set your installed paths (normally one of the following):
295293

296-
C:\msys2\mingw64\bin
297-
or
298-
C:\msys64\mingw64\bin
294+
C:\msys32\mingw32\bin (32-bit msys2, targeting 32-bit builds)
295+
C:\msys64\mingw32\bin (64-bit msys2, targeting 32-bit builds)
296+
C:\msys64\mingw64\bin (64-bit msys2, targeting 64-bit builds)
299297

300298
Test if gcc is on your path. From a CMD (or COMMAND on '95/98) window:
301299

@@ -430,9 +428,9 @@ And if you use msys2 to build python support (as one line):
430428
DYNAMIC_PYTHON=yes
431429
PYTHON_VER=27
432430
DYNAMIC_PYTHON_DLL=libpython2.7.dll
433-
ARCH=x86-64
434431
STATIC_STDCPLUS=yes
435432

433+
(This is for 64-bit builds. For 32-bit builds, replace mingw64 with mingw32.)
436434
You will end up with a Python-enabled, Win32 version. Enjoy!
437435

438436

@@ -590,7 +588,7 @@ E.g. When using MSVC (as one line):
590588
Or when using MinGW (as one line):
591589

592590
mingw32-make -f Make_ming.mak
593-
LUA=C:\projects\lua53 DYNAMIC_LUA=yes LUA_VER=53
591+
LUA=C:/projects/lua53 DYNAMIC_LUA=yes LUA_VER=53
594592

595593

596594
Or when using Cygwin (as one line) (untested):
@@ -622,7 +620,7 @@ E.g. When using MSVC (as one line):
622620
Or when using MinGW (as one line):
623621

624622
mingw32-make -f Make_ming.mak
625-
PERL=C:\Perl DYNAMIC_PERL=yes PERL_VER=522
623+
PERL=C:/Perl DYNAMIC_PERL=yes PERL_VER=522
626624

627625

628626
11. Building with Ruby support
@@ -684,12 +682,12 @@ config.h and Ruby's DLL name. Here are the steps for working around them:
684682

685683
Note that ruby_2_4 is the branch name for Ruby 2.4.X's source code.
686684
There is no need to build whole Ruby, just config.h is needed.
687-
If you use 32-bit MSVC10, the config.h is generated in the
685+
If you use 32-bit MSVC 2015, the config.h is generated in the
688686
.ext\include\i386-mswin32_140 directory.
689687

690688
3) Install the generated config.h.
691689

692-
xcopy /s .ext\include E:\Ruby24\include\ruby-2.4.0
690+
xcopy /s .ext\include C:\Ruby24\include\ruby-2.4.0
693691

694692
Note that 2.4.0 is Ruby API version of Ruby 2.4.X.
695693
You may need to close the console and reopen it to pick up the new $PATH.
@@ -712,7 +710,7 @@ Using MinGW is easier than using MSVC when linking with RubyInstaller.
712710
After you install RubyInstaller, just type this (as one line):
713711

714712
mingw32-make -f Make_ming.mak
715-
RUBY=C:/Ruby22 DYNAMIC_RUBY=yes RUBY_VER=22 RUBY_API_VER_LONG=2.2.0
713+
RUBY=C:/Ruby24 DYNAMIC_RUBY=yes RUBY_VER=24 RUBY_API_VER_LONG=2.4.0
716714
WINVER=0x501
717715

718716
If you set WINVER explicitly, it must be set to >=0x500, when building with
@@ -749,7 +747,7 @@ E.g. When using MSVC (as one line):
749747
Or when using MinGW (as one line):
750748

751749
mingw32-make -f Make_ming.mak
752-
TCL=C:\Tcl86 DYNAMIC_TCL=yes TCL_VER=86 TCL_VER_LONG=8.6
750+
TCL=C:/Tcl86 DYNAMIC_TCL=yes TCL_VER=86 TCL_VER_LONG=8.6
753751

754752

755753
13. Building with Terminal support
@@ -777,13 +775,14 @@ The Windows 3.1x support was removed in patch 7.4.1364.
777775
15. MS-DOS
778776
==========
779777

780-
The MS-DOS support was removed in patch 7.4.1399.
778+
The MS-DOS support was removed in patch 7.4.1399. Only very old Vim versions
779+
work on MS-DOS because of the limited amount of memory available.
781780

782781

783782
16. Installing after building from sources
784783
==========================================
785784

786-
[provided by Michael Soyka]
785+
[provided by Michael Soyka, updated by Ken Takata]
787786

788787
After you've built the Vim binaries as described above, you're ready to
789788
install Vim on your system. However, if you've obtained the Vim sources
@@ -809,17 +808,54 @@ correct directory structure.
809808
new binaries you created above into "vim80":
810809

811810
copy src\*.exe vim80
812-
copy src\GvimExt\gvimext.dll vim80
811+
copy src\tee\tee.exe vim80
813812
copy src\xxd\xxd.exe vim80
814813

815-
C. Move the "vim80" directory into the Vim installation subdirectory
814+
To install the "Edit with Vim" popup menu, you need both 32-bit and 64-bit
815+
versions of gvimext.dll. They should be copied to "vim80\GvimExt32" and
816+
"vim80\GvimExt64" respectively.
817+
First, build the 32-bit version, then:
818+
819+
mkdir vim80\GvimExt32
820+
copy src\GvimExt\gvimext.dll vim80\GvimExt32
821+
822+
Next, clean the 32-bit version and build the 64-bit version, then:
823+
824+
mkdir vim80\GvimExt64
825+
copy src\GvimExt\gvimext.dll vim80\GvimExt64
826+
827+
C. Copy gettext and iconv DLLs into the "vim80" directory
828+
----------------------------------------------------------
829+
Get gettext and iconv DLLs from the following site:
830+
https://github.com/mlocati/gettext-iconv-windows/releases
831+
Both 64- and 32-bit versions are needed.
832+
Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
833+
DLLs and place them as follows:
834+
835+
vim80\
836+
| libintl-8.dll
837+
| libiconv-2.dll
838+
| libgcc_s_sjlj-1.dll (only for 32-bit)
839+
|
840+
+ GvimExt32\
841+
| libintl-8.dll
842+
| libiconv-2.dll
843+
| libgcc_s_sjlj-1.dll
844+
|
845+
` GvimExt64\
846+
libintl-8.dll
847+
libiconv-2.dll
848+
849+
The DLLs in the "vim80" should be the same bitness with the (g)vim.exe.
850+
851+
D. Move the "vim80" directory into the Vim installation subdirectory
816852
---------------------------------------------------------------------
817853
Move the "vim80" subdirectory into the subdirectory where you want Vim
818854
to be installed. Typically, this subdirectory will be named "vim".
819855
If you already have a "vim80" subdirectory in "vim", delete it first
820856
by running its uninstal.exe program.
821857

822-
D. Install Vim
858+
E. Install Vim
823859
---------------
824860
"cd" to your Vim installation subdirectory "vim\vim80" and run the
825861
"install.exe" program. It will ask you a number of questions about

src/version.c

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

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1268,
764766
/**/
765767
1267,
766768
/**/

0 commit comments

Comments
 (0)