[Emacs-diffs] Changes to emacs/nt/INSTALL

[Juanma Barranquero]

Index: emacs/nt/INSTALL
diff -c emacs/nt/INSTALL:1.24 emacs/nt/INSTALL:1.25
*** emacs/nt/INSTALL:1.24       Mon Oct 25 19:57:18 2004
--- emacs/nt/INSTALL    Tue May 24 10:40:51 2005
***************
*** 1,7 ****
                      Building and Installing Emacs
                on Windows NT/2K/XP and Windows 95/98/ME
  
!   Copyright (c) 2001,2004 Free Software Foundation, Inc.
    See the end of the file for copying permissions.
  
    If you used WinZip to unpack the distribution, we suggest to
--- 1,7 ----
                      Building and Installing Emacs
                on Windows NT/2K/XP and Windows 95/98/ME
  
!   Copyright (c) 2001,2004,2005 Free Software Foundation, Inc.
    See the end of the file for copying permissions.
  
    If you used WinZip to unpack the distribution, we suggest to
***************
*** 21,29 ****
    in your path, and that it will create files that do not yet exist.
  
    To compile Emacs, you will need either Microsoft Visual C++ 2.0 or
!   later and nmake, or a Windows port of GCC 2.95 or later with Mingw
    and W32 API support and a port of GNU make.  You can use the Cygwin
!   ports of GCC, but Emacs requires the Mingw headers and libraries to
    build (latest versions of the Cygwin toolkit, at least since v1.3.3,
    include the MinGW headers and libraries as an integral part).
  
--- 21,29 ----
    in your path, and that it will create files that do not yet exist.
  
    To compile Emacs, you will need either Microsoft Visual C++ 2.0 or
!   later and nmake, or a Windows port of GCC 2.95 or later with MinGW
    and W32 API support and a port of GNU make.  You can use the Cygwin
!   ports of GCC, but Emacs requires the MinGW headers and libraries to
    build (latest versions of the Cygwin toolkit, at least since v1.3.3,
    include the MinGW headers and libraries as an integral part).
  
***************
*** 34,47 ****
    like this, we recommend the use of the supported compilers mentioned
    in the previous paragraph.
  
!   You will also need a copy of the Posix cp, rm and mv programs. These
!   and other useful Posix utilities can be obtained from the Mingw or
!   Cygwin projects.
  
    If you build Emacs on Windows 9X or ME, not on Windows 2K/XP or
    Windows NT, we suggest to install the Cygwin port of Bash.
  
!   Please see http://www.mingw.org for pointers to GCC/Mingw and binaries.
  
    For reference, here is a list of which builds of GNU make are known
    to work or not, and whether they work in the presence and/or absence
--- 34,55 ----
    like this, we recommend the use of the supported compilers mentioned
    in the previous paragraph.
  
!   You will also need a copy of the Posix cp, rm and mv programs.  These
!   and other useful Posix utilities can be obtained from one of several
!   projects:
! 
!   * http://www.mingw.org/                         ( MinGW    )
!   * http://www.cygwin.org/                        ( Cygwin   )
!   * http://unxutils.sourceforge.net/              ( UnxUtils )
!   * http://gnuwin32.sourceforge.net/              ( GnuWin32 )
  
    If you build Emacs on Windows 9X or ME, not on Windows 2K/XP or
    Windows NT, we suggest to install the Cygwin port of Bash.
  
!   Additional instructions and help for building Emacs on Windows can be
!   found at the Emacs Wiki:
! 
!   http://www.emacswiki.org/cgi-bin/wiki/WThirtyTwoInstallationKit
  
    For reference, here is a list of which builds of GNU make are known
    to work or not, and whether they work in the presence and/or absence
***************
*** 109,117 ****
    able to detect the headers.
  
    To use the external image support, the DLLs implementing the
!   functionality must be found when Emacs is started, either on the PATH,
!   or in the same directory as emacs.exe.  Failure to find a library is
!   not an error; the associated image format will simply be unavailable.
  
    Some image libraries have dependencies on one another, or on zlib.
    For example, tiff support depends on the jpeg library.  If you did not
--- 117,129 ----
    able to detect the headers.
  
    To use the external image support, the DLLs implementing the
!   functionality must be found when Emacs first needs them, either on the
!   PATH, or in the same directory as emacs.exe.  Failure to find a
!   library is not an error; the associated image format will simply be
!   unavailable.  Note that once Emacs has determined that a library can
!   not be found, there's no way to force it to try again, other than
!   restarting.  See the variable `image-library-alist' to configure the
!   expected names of the libraries.
  
    Some image libraries have dependencies on one another, or on zlib.
    For example, tiff support depends on the jpeg library.  If you did not
***************
*** 120,133 ****
    compatible (for example, that they were built with the same compiler).
  
    Binaries for the image libraries (among many others) can be found at
!   GnuWin32 (http://gnuwin32.sourceforge.net).  These are built with
!   MinGW, and so are very compatible with GCC/MinGW builds of Emacs (like
!   the official binary tarballs for Windows).  Compatibility with MSVC,
!   on the other hand, is still weak and should not be trusted in
!   production environments; if you really need an MSVC-compiled Emacs
!   with image support, you should try to build the required libraries
!   with the same compiler (though it can be extremely non-trivial, and
!   we'll be interested on hearing of any such effort).
  
  * Building
  
--- 132,139 ----
    compatible (for example, that they were built with the same compiler).
  
    Binaries for the image libraries (among many others) can be found at
!   the GnuWin32 project.  These are built with MinGW, but they can be
!   used with both GCC/MinGW and MSVC builds of Emacs.
  
  * Building
  
***************
*** 162,168 ****
  * Trouble-shooting
  
    The main problems that are likely to be encountered when building
!   Emacs stem from using an old version of GCC, or old Mingw or W32 API
    headers.  Additionally, cygwin ports of GNU make may require the Emacs
    source tree to be mounted with text!=binary, because the makefiles
    generated by configure.bat necessarily use DOS line endings.  Also,
--- 168,174 ----
  * Trouble-shooting
  
    The main problems that are likely to be encountered when building
!   Emacs stem from using an old version of GCC, or old MinGW or W32 API
    headers.  Additionally, cygwin ports of GNU make may require the Emacs
    source tree to be mounted with text!=binary, because the makefiles
    generated by configure.bat necessarily use DOS line endings.  Also,