From: claudio.bley@gmail.com (Claudio Bley)
To: emacs-devel@gnu.org
Subject: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5
Date: Fri, 25 Oct 2013 17:36:22 +0200 [thread overview]
Message-ID: <87y55he51l.wl%claudio.bley@gmail.com> (raw)
In-Reply-To: <cover.1382714399.git.claudio.bley@gmail.com>
---
lisp/term/w32-win.el | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b1e7d9b..9db771b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -215,12 +215,16 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
;; earlier versions. Set up the list of libraries according to
;; 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")
- '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
- ;; these are libpng 1.2.8 from GTK+
- "libpng13d.dll" "libpng13.dll"))
+ (if (>= libpng-version 10500)
+ (let ((major (/ libpng-version 10000))
+ (minor (mod (/ libpng-version 100) 10)))
+ (list 'png (format "libpng%d%d.dll" major minor)))
+ (if (>= libpng-version 10400)
+ ;; libpng14-14.dll is libpng 1.4.3 from GTK+
+ '(png "libpng14-14.dll" "libpng14.dll")
+ '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
+ ;; these are libpng 1.2.8 from GTK+
+ "libpng13d.dll" "libpng13.dll")))
'(tiff "libtiff3.dll" "libtiff.dll")
(if (> jpeglib-version 0)
(list 'jpeg (format "libjpeg-%d.dll" (/ jpeglib-version 10)))
--
1.8.4.msysgit.0
--
Claudio--
Claudio
next prev parent reply other threads:[~2013-10-25 15:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1382714399.git.claudio.bley@gmail.com>
2013-10-25 15:35 ` [PATCH 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime Claudio Bley
2013-10-27 16:25 ` Eli Zaretskii
2013-10-25 15:36 ` Claudio Bley [this message]
2013-10-27 16:28 ` [PATCH 2/5] w32: add support for recent PNG library version >= 1.5 Eli Zaretskii
2013-10-29 8:44 ` Claudio Bley
2013-10-29 16:50 ` Eli Zaretskii
2013-10-30 12:50 ` Claudio Bley
2013-11-01 9:21 ` Eli Zaretskii
2013-10-25 15:36 ` [PATCH 3/5] w32: add support for default library names for libtiff Claudio Bley
2013-10-27 16:30 ` Eli Zaretskii
2013-10-25 15:36 ` [PATCH 4/5] Fix parsing of NetPBM file comments Claudio Bley
2013-10-25 15:37 ` [PATCH 2/5] w32: add support for recent PNG library version >= 1.5 Claudio Bley
2013-10-29 8:10 ` [PATCH 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=87y55he51l.wl%claudio.bley@gmail.com \
--to=claudio.bley@gmail.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.