aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Bley2013-11-01 11:04:16 +0200
committerEli Zaretskii2013-11-01 11:04:16 +0200
commit019c8218f07fd2acca84661be01147c50908d903 (patch)
tree18c41efde15605957437b0c7af9bbaba1a58b876
parentac1bf374c2ec182d5f193ed6c27a5a839fdbef54 (diff)
downloademacs-019c8218f07fd2acca84661be01147c50908d903.tar.gz
emacs-019c8218f07fd2acca84661be01147c50908d903.zip
lisp/term/w32-win.el (dynamic-library-alist): Support libtiff v4.x on w32.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/term/w32-win.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03819e49d29..a73c38bd522 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,7 @@
4 of libjpeg starting with v7: look only for the DLL from the 4 of libjpeg starting with v7: look only for the DLL from the
5 version against which Emacs was built. 5 version against which Emacs was built.
6 Support versions of libpng beyond 1.4.x. 6 Support versions of libpng beyond 1.4.x.
7 Support libtiff v4.x.
7 8
82013-11-01 Bozhidar Batsov <bozhidar@batsov.com> 92013-11-01 Bozhidar Batsov <bozhidar@batsov.com>
9 10
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index ab314127cc4..513a99d4914 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -228,7 +228,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
228 '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll" 228 '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
229 ;; these are libpng 1.2.8 from GTK+ 229 ;; these are libpng 1.2.8 from GTK+
230 "libpng13d.dll" "libpng13.dll")) 230 "libpng13d.dll" "libpng13.dll"))
231 '(tiff "libtiff3.dll" "libtiff.dll") 231 '(tiff "libtiff-5.dll" "libtiff3.dll" "libtiff.dll")
232 (if (> libjpeg-version 62) 232 (if (> libjpeg-version 62)
233 ;; Versions of libjpeg after 6b are incompatible with 233 ;; Versions of libjpeg after 6b are incompatible with
234 ;; earlier versions, and each of versions 7, 8, and 9 is 234 ;; earlier versions, and each of versions 7, 8, and 9 is