From: Claudio Bley Date: Fri, 1 Nov 2013 08:57:55 +0000 (+0200) Subject: Support libpng DLLs of versions beyond 1.4.x on MS-Windows. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1044 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac1bf374c2ec182d5f193ed6c27a5a839fdbef54;p=emacs.git Support libpng DLLs of versions beyond 1.4.x on MS-Windows. lisp/term/w32-win.el (dynamic-library-alist): Support versions of libpng beyond 1.4.x. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eecc10efbb9..03819e49d29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * term/w32-win.el (dynamic-library-alist): Support newer versions of libjpeg starting with v7: look only for the DLL from the version against which Emacs was built. + Support versions of libpng beyond 1.4.x. 2013-11-01 Bozhidar Batsov diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index bf5f1b6435c..ab314127cc4 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -216,8 +216,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") ;; the version we were compiled against. (If we were compiled ;; without PNG support, libpng-version's value is -1.) (if (>= libpng-version 10400) - ;; libpng14-14.dll is libpng 1.4.3 from GTK+ - '(png "libpng14-14.dll" "libpng14.dll") + (let ((major (/ libpng-version 10000)) + (minor (mod (/ libpng-version 100) 10))) + (list 'png + ;; libpngXY.dll is the default name when building + ;; with CMake or from a lpngXYY tarball on w32, + ;; libpngXY-XY.dll is the DLL name when building + ;; with libtool / autotools + (format "libpng%d%d.dll" major minor) + (format "libpng%d%d-%d%d.dll" major minor major minor))) '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll" ;; these are libpng 1.2.8 from GTK+ "libpng13d.dll" "libpng13.dll"))