summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-10-03 20:41:31 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-10-03 20:41:31 +0000
commitc0b63c111b86492f0571efeab5183ba1ff2be5ad (patch)
tree0459211768f9744c2a31c975614509025442c978 /amiga
parentc46e0e60155c204651ce67504e10b8523bfcbdc9 (diff)
downloadnetsurf-c0b63c111b86492f0571efeab5183ba1ff2be5ad.tar.gz
netsurf-c0b63c111b86492f0571efeab5183ba1ff2be5ad.tar.bz2
WebP image support, needs libwebp (from trunk/libwebp) and libvpx.
Only enabled for Amiga build currently, may have colour issues on little-endian CPUs svn path=/trunk/netsurf/; revision=10860
Diffstat (limited to 'amiga')
-rwxr-xr-xamiga/dist/Install6
-rwxr-xr-xamiga/pkg/makepackage2
2 files changed, 7 insertions, 1 deletions
diff --git a/amiga/dist/Install b/amiga/dist/Install
index 145c95887..b3cf3d929 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -110,7 +110,11 @@
(if (= #same 0) ;if #sobj is newer than that pointed to by #sobj_link
(
+ (if (exists (#sobj2))
+ (delete #sobj2 (optional "force")) ;prevent dodgy recursive links
+ )
(set #linkcmd (cat "makelink " #sobj2 " SObjs:" #sobj " soft"))
+ (transcript "Running " #linkcmd)
(run #linkcmd)
)
)
@@ -445,6 +449,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 "libvpx.so.0.9.2" "libvpx.so.0")
; (p_linksobj "libpng14.so.14" "libpng.so")
)
)
@@ -505,6 +510,7 @@
(p_setmimetype "bmp" "image/bmp")
(p_setmimetype "ico" "image/ico")
(p_setmimetype "sprite" "image/x-riscos-sprite")
+(p_setmimetype "webp" "image/webp")
(p_setmimetype "lha" "application/x-lha")
(p_setmimetype "zip" "application/x-zip")
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index 3799a2b0a..f198a35fb 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.8 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:libiconv.so ram:NetSurf/SObjs clone
+copy sobjs:libjpeg.so.8 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:libiconv.so sobjs:libvpx.so.0.9.2 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