From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: claudio.bley@gmail.com (Claudio Bley) Newsgroups: gmane.emacs.devel Subject: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5 Date: Fri, 25 Oct 2013 17:37:28 +0200 Message-ID: <87txg5e4zr.wl%claudio.bley@gmail.com> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1382716935 20159 80.91.229.3 (25 Oct 2013 16:02:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Oct 2013 16:02:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 25 18:02:17 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VZjq0-0003yy-W3 for ged-emacs-devel@m.gmane.org; Fri, 25 Oct 2013 18:02:13 +0200 Original-Received: from localhost ([::1]:59938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZjq0-0006Z8-Im for ged-emacs-devel@m.gmane.org; Fri, 25 Oct 2013 12:02:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZjoB-0004D0-St for emacs-devel@gnu.org; Fri, 25 Oct 2013 12:00:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZjnx-0000tu-Bg for emacs-devel@gnu.org; Fri, 25 Oct 2013 12:00:19 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:50913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZjnx-0000r2-6R for emacs-devel@gnu.org; Fri, 25 Oct 2013 12:00:05 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VZjZP-0005m5-Fb for emacs-devel@gnu.org; Fri, 25 Oct 2013 17:45:03 +0200 Original-Received: from 178-24-125-95-dynip.superkabel.de ([178.24.125.95]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Oct 2013 17:45:03 +0200 Original-Received: from claudio.bley by 178-24-125-95-dynip.superkabel.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Oct 2013 17:45:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 38 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 178-24-125-95-dynip.superkabel.de In-Reply-To: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164539 Archived-At: --- 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