summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xamiga/dist/Install2
-rwxr-xr-xamiga/pkg/makepackage4
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e16d3bc6e..f1574d783 100644
--- a/Makefile
+++ b/Makefile
@@ -516,7 +516,7 @@ ifeq ($(TARGET),amiga)
$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
- CFLAGS += -D__USE_INLINE__ -std=c99 -I . -Dnsamiga
+ CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I SDK:local/common/include/libpng12 -Dnsamiga
LDFLAGS += -lxml2 -ldl -lcurl -lpthread -lregex -lauto
LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
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