aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-09-25 18:16:07 +0300
committerEli Zaretskii2016-09-25 18:16:07 +0300
commitc14a1d4580b831bb1c62f273a11cee90d6ee283e (patch)
tree2b3b78ca72d6f40d52cc2b2d54ad1785d605e21f
parentf2819241bc93b641f13e1a04f3520fadb8ed53a8 (diff)
downloademacs-c14a1d4580b831bb1c62f273a11cee90d6ee283e.tar.gz
emacs-c14a1d4580b831bb1c62f273a11cee90d6ee283e.zip
Minor copyedits of MS-Windows installation instructions
* nt/INSTALL: * nt/README.W32: Add URL of Emacs dependencies on alpha.gnu.org.
-rw-r--r--nt/INSTALL22
-rw-r--r--nt/README.W3218
2 files changed, 27 insertions, 13 deletions
diff --git a/nt/INSTALL b/nt/INSTALL
index fff0eb6f8d9..cd726cbecbb 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -633,11 +633,13 @@ build will run on Windows 9X and newer systems).
633 633
634 To support XPM images (required for color tool-bar icons), you will 634 To support XPM images (required for color tool-bar icons), you will
635 need the libXpm library. It is available from the ezwinports site, 635 need the libXpm library. It is available from the ezwinports site,
636 http://sourceforge.net/projects/ezwinports/files/. 636 http://sourceforge.net/projects/ezwinports/files/ and from
637 http://alpha.gnu.org/gnu/emacs/pretest/windows/.
637 638
638 For PNG images, we recommend to use versions 1.4.x and later of 639 For PNG images, we recommend to use versions 1.4.x and later of
639 libpng, because previous versions had security issues. You can find 640 libpng, because previous versions had security issues. You can find
640 precompiled libraries and headers on the ezwinports site. 641 precompiled libraries and headers on the ezwinports site and on
642 alpha.gnu.
641 643
642 Versions 1.4.0 and later of libpng are binary incompatible with 644 Versions 1.4.0 and later of libpng are binary incompatible with
643 earlier versions, so Emacs will only look for libpng libraries which 645 earlier versions, so Emacs will only look for libpng libraries which
@@ -654,7 +656,8 @@ build will run on Windows 9X and newer systems).
654 For GIF images, we recommend to use versions 5.0.0 or later of 656 For GIF images, we recommend to use versions 5.0.0 or later of
655 giflib, as it is much enhanced wrt previous versions. You can find 657 giflib, as it is much enhanced wrt previous versions. You can find
656 precompiled binaries and headers for giflib on the ezwinports site, 658 precompiled binaries and headers for giflib on the ezwinports site,
657 http://sourceforge.net/projects/ezwinports/files/. 659 http://sourceforge.net/projects/ezwinports/files/ and on
660 http://alpha.gnu.org/gnu/emacs/pretest/windows/.
658 661
659 Version 5.0.0 and later of giflib are binary incompatible with 662 Version 5.0.0 and later of giflib are binary incompatible with
660 previous versions (the signatures of several functions have 663 previous versions (the signatures of several functions have
@@ -668,7 +671,7 @@ build will run on Windows 9X and newer systems).
668 671
669 For JPEG images, you will need libjpeg 6b or later, which will be 672 For JPEG images, you will need libjpeg 6b or later, which will be
670 called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll. You can 673 called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll. You can
671 find these on the ezwinports site. 674 find these on the ezwinports site and on alpha.gnu.
672 675
673 TIFF images require libTIFF 3.0 or later, which will be called 676 TIFF images require libTIFF 3.0 or later, which will be called
674 libtiffN.dll or libtiff-N.dll or libtiff.dll. These can be found on 677 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).
695 because the compiler needs to see their header files when building 698 because the compiler needs to see their header files when building
696 Emacs. 699 Emacs.
697 700
701 http://alpha.gnu.org/gnu/emacs/pretest/windows/
702
703 More fat ports, from the MSYS2 project.
704
698 To use librsvg at runtime, ensure that librsvg and its dependencies 705 To use librsvg at runtime, ensure that librsvg and its dependencies
699 are on your PATH, or in the same directory as the emacs.exe binary. 706 are on your PATH, or in the same directory as the emacs.exe binary.
700 If you are downloading from the ezwinports site, you only need to 707 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).
751 session. 758 session.
752 759
753 You can get pre-built binaries (including any required DLL and the 760 You can get pre-built binaries (including any required DLL and the
754 header files) at http://sourceforge.net/projects/ezwinports/files/. 761 header files) at http://sourceforge.net/projects/ezwinports/files/
762 and on http://alpha.gnu.org/gnu/emacs/pretest/windows/.
755 763
756* Optional libxml2 support 764* Optional libxml2 support
757 765
@@ -773,6 +781,7 @@ build will run on Windows 9X and newer systems).
773 (including any required DLL and the header files) is here: 781 (including any required DLL and the header files) is here:
774 782
775 http://sourceforge.net/projects/ezwinports/files/ 783 http://sourceforge.net/projects/ezwinports/files/
784 http://alpha.gnu.org/gnu/emacs/pretest/windows/
776 785
777 For runtime support of libxml2, you will also need to install the 786 For runtime support of libxml2, you will also need to install the
778 libiconv "development" tarball, because the libiconv headers need to 787 libiconv "development" tarball, because the libiconv headers need to
@@ -788,7 +797,8 @@ build will run on Windows 9X and newer systems).
788 797
789 Emacs can decompress text if compiled with the zlib library. 798 Emacs can decompress text if compiled with the zlib library.
790 Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are 799 Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
791 available from the ezwinports site; see above for the URL. 800 available from the ezwinports site and on alpha.gnu; see above for
801 the URLs.
792 802
793 (This library is also a prerequisite for several image libraries, so 803 (This library is also a prerequisite for several image libraries, so
794 you may already have it; look for zlib1.dll or libz-1.dll.) 804 you may already have it; look for zlib1.dll or libz-1.dll.)
diff --git a/nt/README.W32 b/nt/README.W32
index a061596da55..e3f6094f9be 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -140,10 +140,12 @@ See the end of the file for license conditions.
140 140
141 1. http://sourceforge.net/projects/ezwinports/files/ 141 1. http://sourceforge.net/projects/ezwinports/files/
142 -- up-to-date builds, self-contained archives, only for 32-bit Emacs 142 -- up-to-date builds, self-contained archives, only for 32-bit Emacs
143 2. The MSYS2 project -- for 64-bit Emacs: 143 2. Libraries from the MSYS2 project on alpha.gnu.org:
144 http://alpha.gnu.org/gnu/emacs/pretest/windows/.
145 3. The MSYS2 project -- for 64-bit Emacs:
144 http://msys2.github.io/ 146 http://msys2.github.io/
145 https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/ 147 https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
146 3. GnuWin32 project -- very old 32-bit builds, not recommended 148 4. GnuWin32 project -- very old 32-bit builds, not recommended
147 149
148 The libraries to download are mentioned below. Some libraries 150 The libraries to download are mentioned below. Some libraries
149 depend on others that need to be downloaded separately from the same 151 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.
197 but GnuTLS won't be available to the running session. 199 but GnuTLS won't be available to the running session.
198 200
199 You can get pre-built binaries (including any dependency DLLs) at 201 You can get pre-built binaries (including any dependency DLLs) at
200 http://sourceforge.net/projects/ezwinports/files/. 202 http://sourceforge.net/projects/ezwinports/files/ and on
203 http://alpha.gnu.org/gnu/emacs/pretest/windows/.
201 204
202* libxml2 support 205* libxml2 support
203 206
@@ -210,7 +213,8 @@ See the end of the file for license conditions.
210 running session. 213 running session.
211 214
212 You can get pre-built binaries (including any required DLL and the 215 You can get pre-built binaries (including any required DLL and the
213 header files) at http://sourceforge.net/projects/ezwinports/files/. 216 header files) at http://sourceforge.net/projects/ezwinports/files/ and
217 http://alpha.gnu.org/gnu/emacs/pretest/windows/.
214 218
215 219
216* zlib support 220* zlib support
@@ -219,9 +223,9 @@ See the end of the file for license conditions.
219 the zlib-decompress-region primitive. 223 the zlib-decompress-region primitive.
220 224
221 Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are 225 Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
222 available from the ezwinports site; see above for the URL. For the 226 available from the ezwinports site and on alpha.gnu; see above for
223 64-bit DLL, see the instructions below for installing from MSYS2 227 the URLs. For the 64-bit DLL, see the instructions below for
224 site. 228 installing from MSYS2 site.
225 229
226 (This library is also a prerequisite for several image libraries, so 230 (This library is also a prerequisite for several image libraries, so
227 you may already have it; look for zlib1.dll or libz-1.dll.) 231 you may already have it; look for zlib1.dll or libz-1.dll.)