summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2003-01-26 01:33:33 +0000
committerJason Rumney <jasonr@gnu.org>2003-01-26 01:33:33 +0000
commit290682efe61f5704a60a41ff2a196207e6223652 (patch)
tree9aa58d46d2bd13ecae892f5336874a08dfab80d2
parent289083129627effd1f093106c9acdcc0a004d807 (diff)
downloademacs-290682efe61f5704a60a41ff2a196207e6223652.tar.gz
Added notes for JPEG library.
-rw-r--r--etc/NEWS10
-rw-r--r--nt/INSTALL15
2 files changed, 15 insertions, 10 deletions
diff --git a/etc/NEWS b/etc/NEWS
index fe4c41273bf..96a675349a5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -927,10 +927,12 @@ See the Emacs 21.1 NEWS entry for tooltips for details.
---
** Some images are now supported on MS Windows.
-PBM and XBM images are supported, PNG is supported if the libpng
-and zlib headers were available when Emacs was built, and libpng
-and zlib DLLs are available at run-time. Other formats which require
-external libraries may be similarly supported in future.
+PBM and XBM images are supported, PNG is supported if the libpng and
+zlib headers were available when Emacs was built, and libpng and zlib
+DLLs are available at run-time. Likewise, JPEG is supported if the
+jpeg headers were available when Emacs was built, and jpeg.dll is
+available at run-time. Other formats which require external
+libraries may be similarly supported in future.
---
** Sound is now supported on MS Windows.
diff --git a/nt/INSTALL b/nt/INSTALL
index 495a6a78d88..fd44faf943e 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -77,15 +77,18 @@
* Optional image library support
- To build Emacs with support for PNG image, the libpng and zlib headers
- must be in the include path when the configure script is run. This can
- be setup using environment variables, or by specifying --cflags -I...
- options on the command-line to configure. The configure script will
- report whether it was able to detect the headers.
+ To build Emacs with support for PNG image, the libpng and zlib
+ headers must be in the include path when the configure script is
+ run. Likewise, the jpeg headers must be in the include path for
+ JPEG support. This can be setup using environment variables, or by
+ specifying --cflags -I... options on the command-line to
+ configure.bat. The configure script will report whether it was able
+ to detect the headers.
To use the PNG support, zlib.dll (or zlibd.dll) and libpng.dll (or
libpng13.dll, or libpng13d.dll) must be on the PATH or in the same
- directory as emacs.exe when Emacs is started.
+ directory as emacs.exe when Emacs is started. For JPEG support,
+ jpeg.dll must be on the path or emacs.exe directory.
* Building