From 7ec2cc7f8ee03a02662f5071164f7939dd44b8f3 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 20 Mar 2011 23:32:44 +0000 Subject: Update to use official libwebp 0.1 Remove libvpx references as no longer needed. svn path=/trunk/netsurf/; revision=12115 --- amiga/Makefile.target | 2 +- amiga/dist/Install | 2 -- amiga/pkg/makepackage | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'amiga') diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 94fa8dd49..551d12cf9 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -22,7 +22,7 @@ ifeq ($(HOST),amiga) $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) - $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp))) + $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp))) $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon )) $(eval $(call feature_enabled,PLUGINS,-DWITH_PLUGIN,,DataTypes images)) diff --git a/amiga/dist/Install b/amiga/dist/Install index 91be1623f..60dabcf99 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -484,8 +484,6 @@ (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 "libvpx.so.0.9.5" "libvpx.so.0") -; (p_linksobj "libpng14.so.14" "libpng.so") ) ) diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage index ca9216c8a..c3b49133c 100755 --- a/amiga/pkg/makepackage +++ b/amiga/pkg/makepackage @@ -24,5 +24,5 @@ makedir ram:NetSurf/Libs copy libs:parserutils.library libs:nsgif.library libs:nsbmp.library libs:iconv.library libs:hubbub.library ram:NetSurf/Libs ; libs:css.library libs:wapcaplet.library makedir ram:NetSurf/SObjs -copy sobjs:libjpeg.so.8 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libvpx.so.0.9.5 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so ram:NetSurf/SObjs clone +copy sobjs:libjpeg.so.8 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libwebp.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so ram:NetSurf/SObjs clone ;sobjs:libhpdf-2.2.0.so.0.0 -- cgit v1.2.3