diff options
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/Makefile.target | 8 | ||||
| -rw-r--r-- | amiga/iff_dr2d.c | 2 | ||||
| -rwxr-xr-x | amiga/pkg/makepackage | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 5b11ec018..af4b0bd83 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -33,7 +33,7 @@ ifeq ($(HOST),amiga) $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes)) CFLAGS += -I /SDK/local/common/include/libpng12 - LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl + LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES) @@ -51,10 +51,10 @@ else $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include - CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcurl openssl) + CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl openssl) CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libdom libcss) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl openssl) LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libdom libcss) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib @@ -106,7 +106,7 @@ AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library iconv.library hubbub.library AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES)) -AMIGA_SHARED_OBJS := libjpeg.so.12 libxml2.so.9 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \ +AMIGA_SHARED_OBJS := libjpeg.so.12 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \ libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0 libwapcaplet.so.0 libpng12.so \ libdom.so.0 libhubbub.so.0 libtre.so.5 libintl.so AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS)) diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c index 8c2cdf7ac..b428ed25f 100644 --- a/amiga/iff_dr2d.c +++ b/amiga/iff_dr2d.c @@ -333,7 +333,7 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename) /* * This code can be compiled as a standalone program for testing etc. * Use something like the following line: - * gcc -o svg2dr2d iff_dr2d.c -lauto -lsvgtiny -lxml2 -lpthread -lz -use-dynld + * gcc -o svg2dr2d iff_dr2d.c -lauto -lsvgtiny -lpthread -lz -use-dynld * -DWITH_NS_SVG -DAMIGA_DR2D_STANDALONE -D__USE_INLINE__ */ const char USED ver[] = "\0$VER: svg2dr2d 1.1 (18.05.2009)\0"; diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage index b99e52044..dcc130a6a 100755 --- a/amiga/pkg/makepackage +++ b/amiga/pkg/makepackage @@ -24,7 +24,7 @@ makedir ram:NetSurf/Libs copy libs:parserutils.library libs:nsgif.library libs:nsbmp.library libs:iconv.library libs:hubbub.library ram:NetSurf/Libs ; libs:css.library libs:wapcaplet.library makedir ram:NetSurf/SObjs -copy sobjs:libjpeg.so.8 sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone +copy sobjs:libjpeg.so.8 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone ;sobjs:libhpdf-2.2.0.so.0.0 echo "Splitting Messages file" perl utils/split-messages.pl de ami < resources/FatMessages >RAM:NetSurf/Resources/de/Messages |