summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Docs/BUILDING-AmigaOS5
-rw-r--r--Makefile1
-rwxr-xr-xamiga/dist/Install2
-rwxr-xr-xamiga/pkg/makepackage2
4 files changed, 5 insertions, 5 deletions
diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS
index 52798bf48..cf35c541f 100644
--- a/Docs/BUILDING-AmigaOS
+++ b/Docs/BUILDING-AmigaOS
@@ -82,10 +82,9 @@
--------
NetSurf uses libMNG to display MNG and PNG files.
- It builds without any problems on OS4, or an older version is available
- from Aminet:
+ It builds without any problems on OS4, or available from Aminet:
- http://www.aminet.net/package/dev/lib/libmng
+ http://www.aminet.net/package/dev/lib/libmng_so
libxml2
diff --git a/Makefile b/Makefile
index f8ca7e22d..f6efe77b6 100644
--- a/Makefile
+++ b/Makefile
@@ -450,6 +450,7 @@ ifeq ($(TARGET),amiga)
$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,NetSurf GIF decoder))
$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG support))
$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG rendering))
+ $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,libmng extras))
CFLAGS += -D__USE_INLINE__ -std=c99 -I . -Dnsamiga
LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto -lparserutils
diff --git a/amiga/dist/Install b/amiga/dist/Install
index 6dcb4baee..0b60963b4 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -266,7 +266,7 @@
(foreach "SObjs" "#?"
(complete #complete)
(p_copysobj @each-name)
- (set #complete (+ #complete 5))
+ (set #complete (+ #complete 4))
)
)
)
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index 892363672..dfee44c29 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -20,5 +20,5 @@ copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/
makedir ram:NetSurf/Rexx
copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
makedir ram:NetSurf/SObjs
-copy sobjs:libgcc.so sobjs:libc.so sobjs:libjpeg.so sobjs:libpthread.so sobjs:libexpat.so sobjs:libhubbub.so sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so ram:NetSurf/SObjs clone
+copy sobjs:libgcc.so sobjs:libc.so sobjs:libjpeg.so sobjs:libpthread.so sobjs:libexpat.so sobjs:libhubbub.so sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2-2.6.so ram:NetSurf/SObjs clone
;sobjs:libcurl-7.16.so sobjs:libssl-0.9.8.so