From ee590763c690340b9374a453b71678b0d2b13d77 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 12 Oct 2012 19:38:47 +0100 Subject: use libtre instead of libregex for native builds, same as cross-compile --- amiga/Makefile.target | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 83cb0176e..421b3173f 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -31,7 +31,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 -lregex -lauto -lpbl + LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES) @@ -110,7 +110,9 @@ 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 libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0 libwapcaplet.so.0 libpng12.so libdom.so.0 libhubbub.so.0 +AMIGA_SHARED_OBJS := libjpeg.so.12 libxml2.so.9 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)) AMIGA_DISTRIBUTION_FILES := amiga/dist/* AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga -- cgit v1.2.3