summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-05-03 15:12:06 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-05-03 15:12:06 +0000
commit6e0f8d9a48eece5555f7bd0c6056684180bea285 (patch)
tree4b3e263310a0821d1a792188d98728862893bd1f /amiga
parentd8b440a4266ec37602acadce25f8fc465509e53b (diff)
downloadnetsurf-6e0f8d9a48eece5555f7bd0c6056684180bea285.tar.gz
netsurf-6e0f8d9a48eece5555f7bd0c6056684180bea285.tar.bz2
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
Diffstat (limited to 'amiga')
-rwxr-xr-xamiga/dist/Install2
-rwxr-xr-xamiga/pkg/makepackage4
2 files changed, 3 insertions, 3 deletions
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