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
This commit is contained in:
Chris Young 2010-05-03 15:12:06 +00:00
parent d8b440a426
commit 6e0f8d9a48
3 changed files with 4 additions and 4 deletions

View File

@ -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

2
amiga/dist/Install vendored
View File

@ -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")
)
)

View File

@ -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