diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-11-10 22:45:34 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-11-10 22:45:34 +0000 |
| commit | d27952c35947eb5adfc6ea6517e68cda24fd9745 (patch) | |
| tree | c236dd860b081e241992807e5ff4e7dbb67de43c /amiga | |
| parent | 17542373bdf8d306275cf7b4e087a436119674ba (diff) | |
| download | netsurf-d27952c35947eb5adfc6ea6517e68cda24fd9745.tar.gz netsurf-d27952c35947eb5adfc6ea6517e68cda24fd9745.tar.bz2 | |
Update to newer libcurl, avoids libssl conflicts (credit: MickJT)
svn path=/trunk/netsurf/; revision=10943
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/Makefile.target | 2 | ||||
| -rwxr-xr-x | amiga/pkg/makepackage | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index c2b546563..994d31177 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -20,7 +20,7 @@ $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp))) $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon )) CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga -LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto +LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -lregex -lauto LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet -liconv ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES) diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage index f1c43a838..5c3d68030 100755 --- a/amiga/pkg/makepackage +++ b/amiga/pkg/makepackage @@ -21,5 +21,5 @@ 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: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.5 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 ram:NetSurf/SObjs clone +copy sobjs:libjpeg.so.8 sobjs:libhubbub.so.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.7 sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libiconv.so sobjs:libvpx.so.0.9.5 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:librtmp.so.0 ram:NetSurf/SObjs clone ;sobjs:libhpdf-2.2.0.so.0.0 |