From: Claudio Bley <claudio.bley@googlemail.com>
To: Emacs-devel <emacs-devel@gnu.org>
Subject: [PATCH v2 2/5] w32: add support for recent PNG library version >= 1.5
Date: Wed, 30 Oct 2013 13:43:21 +0100 [thread overview]
Message-ID: <8761sfylna.wl%claudio.bley@gmail.com> (raw)
In-Reply-To: <cover.1383136381.git.claudio.bley@gmail.com>
The naming scheme of the libpng library on w32 is either libpngXY.dll
or libpngXY-XY.dll where X being the major version, Y the minor
version number, respectively.
---
lisp/term/w32-win.el | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b1e7d9b..ff3729d 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"))
--
1.8.4.msysgit.0
next prev parent reply other threads:[~2013-10-30 12:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1383136381.git.claudio.bley@gmail.com>
2013-10-30 12:43 ` [PATCH v2 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime Claudio Bley
2013-11-01 9:16 ` Eli Zaretskii
2013-10-30 12:43 ` Claudio Bley [this message]
2013-11-01 9:16 ` [PATCH v2 2/5] w32: add support for recent PNG library version >= 1.5 Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 3/5] w32: add support for default library names for libtiff Claudio Bley
2013-11-01 9:19 ` Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 4/5] Fix parsing of NetPBM file comments Claudio Bley
2013-11-01 9:19 ` Eli Zaretskii
2013-10-30 12:44 ` [PATCH v2 5/5] Fix file magic for pbm files with comments Claudio Bley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8761sfylna.wl%claudio.bley@gmail.com \
--to=claudio.bley@googlemail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.