Minor copyedits of MS-Windows installation instructions
* nt/INSTALL: * nt/README.W32: Add URL of Emacs dependencies on alpha.gnu.org.
This commit is contained in:
parent
f2819241bc
commit
c14a1d4580
2 changed files with 27 additions and 13 deletions
22
nt/INSTALL
22
nt/INSTALL
|
@ -633,11 +633,13 @@ build will run on Windows 9X and newer systems).
|
||||||
|
|
||||||
To support XPM images (required for color tool-bar icons), you will
|
To support XPM images (required for color tool-bar icons), you will
|
||||||
need the libXpm library. It is available from the ezwinports site,
|
need the libXpm library. It is available from the ezwinports site,
|
||||||
http://sourceforge.net/projects/ezwinports/files/.
|
http://sourceforge.net/projects/ezwinports/files/ and from
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/.
|
||||||
|
|
||||||
For PNG images, we recommend to use versions 1.4.x and later of
|
For PNG images, we recommend to use versions 1.4.x and later of
|
||||||
libpng, because previous versions had security issues. You can find
|
libpng, because previous versions had security issues. You can find
|
||||||
precompiled libraries and headers on the ezwinports site.
|
precompiled libraries and headers on the ezwinports site and on
|
||||||
|
alpha.gnu.
|
||||||
|
|
||||||
Versions 1.4.0 and later of libpng are binary incompatible with
|
Versions 1.4.0 and later of libpng are binary incompatible with
|
||||||
earlier versions, so Emacs will only look for libpng libraries which
|
earlier versions, so Emacs will only look for libpng libraries which
|
||||||
|
@ -654,7 +656,8 @@ build will run on Windows 9X and newer systems).
|
||||||
For GIF images, we recommend to use versions 5.0.0 or later of
|
For GIF images, we recommend to use versions 5.0.0 or later of
|
||||||
giflib, as it is much enhanced wrt previous versions. You can find
|
giflib, as it is much enhanced wrt previous versions. You can find
|
||||||
precompiled binaries and headers for giflib on the ezwinports site,
|
precompiled binaries and headers for giflib on the ezwinports site,
|
||||||
http://sourceforge.net/projects/ezwinports/files/.
|
http://sourceforge.net/projects/ezwinports/files/ and on
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/.
|
||||||
|
|
||||||
Version 5.0.0 and later of giflib are binary incompatible with
|
Version 5.0.0 and later of giflib are binary incompatible with
|
||||||
previous versions (the signatures of several functions have
|
previous versions (the signatures of several functions have
|
||||||
|
@ -668,7 +671,7 @@ build will run on Windows 9X and newer systems).
|
||||||
|
|
||||||
For JPEG images, you will need libjpeg 6b or later, which will be
|
For JPEG images, you will need libjpeg 6b or later, which will be
|
||||||
called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll. You can
|
called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll. You can
|
||||||
find these on the ezwinports site.
|
find these on the ezwinports site and on alpha.gnu.
|
||||||
|
|
||||||
TIFF images require libTIFF 3.0 or later, which will be called
|
TIFF images require libTIFF 3.0 or later, which will be called
|
||||||
libtiffN.dll or libtiff-N.dll or libtiff.dll. These can be found on
|
libtiffN.dll or libtiff-N.dll or libtiff.dll. These can be found on
|
||||||
|
@ -695,6 +698,10 @@ build will run on Windows 9X and newer systems).
|
||||||
because the compiler needs to see their header files when building
|
because the compiler needs to see their header files when building
|
||||||
Emacs.
|
Emacs.
|
||||||
|
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/
|
||||||
|
|
||||||
|
More fat ports, from the MSYS2 project.
|
||||||
|
|
||||||
To use librsvg at runtime, ensure that librsvg and its dependencies
|
To use librsvg at runtime, ensure that librsvg and its dependencies
|
||||||
are on your PATH, or in the same directory as the emacs.exe binary.
|
are on your PATH, or in the same directory as the emacs.exe binary.
|
||||||
If you are downloading from the ezwinports site, you only need to
|
If you are downloading from the ezwinports site, you only need to
|
||||||
|
@ -751,7 +758,8 @@ build will run on Windows 9X and newer systems).
|
||||||
session.
|
session.
|
||||||
|
|
||||||
You can get pre-built binaries (including any required DLL and the
|
You can get pre-built binaries (including any required DLL and the
|
||||||
header files) at http://sourceforge.net/projects/ezwinports/files/.
|
header files) at http://sourceforge.net/projects/ezwinports/files/
|
||||||
|
and on http://alpha.gnu.org/gnu/emacs/pretest/windows/.
|
||||||
|
|
||||||
* Optional libxml2 support
|
* Optional libxml2 support
|
||||||
|
|
||||||
|
@ -773,6 +781,7 @@ build will run on Windows 9X and newer systems).
|
||||||
(including any required DLL and the header files) is here:
|
(including any required DLL and the header files) is here:
|
||||||
|
|
||||||
http://sourceforge.net/projects/ezwinports/files/
|
http://sourceforge.net/projects/ezwinports/files/
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/
|
||||||
|
|
||||||
For runtime support of libxml2, you will also need to install the
|
For runtime support of libxml2, you will also need to install the
|
||||||
libiconv "development" tarball, because the libiconv headers need to
|
libiconv "development" tarball, because the libiconv headers need to
|
||||||
|
@ -788,7 +797,8 @@ build will run on Windows 9X and newer systems).
|
||||||
|
|
||||||
Emacs can decompress text if compiled with the zlib library.
|
Emacs can decompress text if compiled with the zlib library.
|
||||||
Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
|
Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
|
||||||
available from the ezwinports site; see above for the URL.
|
available from the ezwinports site and on alpha.gnu; see above for
|
||||||
|
the URLs.
|
||||||
|
|
||||||
(This library is also a prerequisite for several image libraries, so
|
(This library is also a prerequisite for several image libraries, so
|
||||||
you may already have it; look for zlib1.dll or libz-1.dll.)
|
you may already have it; look for zlib1.dll or libz-1.dll.)
|
||||||
|
|
|
@ -140,10 +140,12 @@ See the end of the file for license conditions.
|
||||||
|
|
||||||
1. http://sourceforge.net/projects/ezwinports/files/
|
1. http://sourceforge.net/projects/ezwinports/files/
|
||||||
-- up-to-date builds, self-contained archives, only for 32-bit Emacs
|
-- up-to-date builds, self-contained archives, only for 32-bit Emacs
|
||||||
2. The MSYS2 project -- for 64-bit Emacs:
|
2. Libraries from the MSYS2 project on alpha.gnu.org:
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/.
|
||||||
|
3. The MSYS2 project -- for 64-bit Emacs:
|
||||||
http://msys2.github.io/
|
http://msys2.github.io/
|
||||||
https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
|
https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
|
||||||
3. GnuWin32 project -- very old 32-bit builds, not recommended
|
4. GnuWin32 project -- very old 32-bit builds, not recommended
|
||||||
|
|
||||||
The libraries to download are mentioned below. Some libraries
|
The libraries to download are mentioned below. Some libraries
|
||||||
depend on others that need to be downloaded separately from the same
|
depend on others that need to be downloaded separately from the same
|
||||||
|
@ -197,7 +199,8 @@ See the end of the file for license conditions.
|
||||||
but GnuTLS won't be available to the running session.
|
but GnuTLS won't be available to the running session.
|
||||||
|
|
||||||
You can get pre-built binaries (including any dependency DLLs) at
|
You can get pre-built binaries (including any dependency DLLs) at
|
||||||
http://sourceforge.net/projects/ezwinports/files/.
|
http://sourceforge.net/projects/ezwinports/files/ and on
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/.
|
||||||
|
|
||||||
* libxml2 support
|
* libxml2 support
|
||||||
|
|
||||||
|
@ -210,7 +213,8 @@ See the end of the file for license conditions.
|
||||||
running session.
|
running session.
|
||||||
|
|
||||||
You can get pre-built binaries (including any required DLL and the
|
You can get pre-built binaries (including any required DLL and the
|
||||||
header files) at http://sourceforge.net/projects/ezwinports/files/.
|
header files) at http://sourceforge.net/projects/ezwinports/files/ and
|
||||||
|
http://alpha.gnu.org/gnu/emacs/pretest/windows/.
|
||||||
|
|
||||||
|
|
||||||
* zlib support
|
* zlib support
|
||||||
|
@ -219,9 +223,9 @@ See the end of the file for license conditions.
|
||||||
the zlib-decompress-region primitive.
|
the zlib-decompress-region primitive.
|
||||||
|
|
||||||
Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
|
Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
|
||||||
available from the ezwinports site; see above for the URL. For the
|
available from the ezwinports site and on alpha.gnu; see above for
|
||||||
64-bit DLL, see the instructions below for installing from MSYS2
|
the URLs. For the 64-bit DLL, see the instructions below for
|
||||||
site.
|
installing from MSYS2 site.
|
||||||
|
|
||||||
(This library is also a prerequisite for several image libraries, so
|
(This library is also a prerequisite for several image libraries, so
|
||||||
you may already have it; look for zlib1.dll or libz-1.dll.)
|
you may already have it; look for zlib1.dll or libz-1.dll.)
|
||||||
|
|
Loading…
Add table
Reference in a new issue