r10943 chris_y - in /trunk/netsurf/amiga: Makefile.target pkg/makepackage

netsurf at semichrome.net netsurf at semichrome.net
Wed Nov 10 22:45:35 GMT 2010


Author: chris_y
Date: Wed Nov 10 16:45:34 2010
New Revision: 10943

URL: http://source.netsurf-browser.org?rev=10943&view=rev
Log:
Update to newer libcurl, avoids libssl conflicts (credit: MickJT)

Modified:
    trunk/netsurf/amiga/Makefile.target
    trunk/netsurf/amiga/pkg/makepackage

Modified: trunk/netsurf/amiga/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/Makefile.target?rev=10943&r1=10942&r2=10943&view=diff
==============================================================================
--- trunk/netsurf/amiga/Makefile.target (original)
+++ trunk/netsurf/amiga/Makefile.target Wed Nov 10 16:45:34 2010
@@ -20,7 +20,7 @@
 $(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)

Modified: trunk/netsurf/amiga/pkg/makepackage
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/pkg/makepackage?rev=10943&r1=10942&r2=10943&view=diff
==============================================================================
--- trunk/netsurf/amiga/pkg/makepackage (original)
+++ trunk/netsurf/amiga/pkg/makepackage Wed Nov 10 16:45:34 2010
@@ -21,5 +21,5 @@
 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 




More information about the netsurf-commits mailing list