From 6e0f8d9a48eece5555f7bd0c6056684180bea285 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 3 May 2010 15:12:06 +0000 Subject: Ensure we are using the libpng 1.2 includes, as OS4 Cairo is using a deprecated function which does not exist in libpng 1.4. svn path=/trunk/netsurf/; revision=10543 --- amiga/dist/Install | 2 +- amiga/pkg/makepackage | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'amiga') diff --git a/amiga/dist/Install b/amiga/dist/Install index 0e3474476..dcde3c6a2 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -429,7 +429,7 @@ (p_linksobj "libz.so.1.2.5" "libz.so") (p_linksobj "libz.so.1.2.5" "libz.so.1") (p_linksobj "libz.so.1.2.5" "libz.so.1.2") - (p_linksobj "libpng14.so.14" "libpng.so") +; (p_linksobj "libpng14.so.14" "libpng.so") ) ) diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage index 0303770fb..b04d4196d 100755 --- a/amiga/pkg/makepackage +++ b/amiga/pkg/makepackage @@ -20,6 +20,6 @@ copy amiga/pkg/fitr ram:NetSurf/ makedir ram:NetSurf/Rexx copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM makedir ram:NetSurf/SObjs -copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libpng14.so.14 ram:NetSurf/SObjs clone -;sobjs:libssl-0.9.8.so sobjs:libexpat.so +copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 ram:NetSurf/SObjs clone +;sobjs:libssl-0.9.8.so sobjs:libexpat.so sobjs:libpng14.so.14 ;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so \ No newline at end of file -- cgit v1.2.3