summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-05-03 17:58:17 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-05-03 17:58:17 +0000
commit048249f71d337274ce8cf1bcf698f700599f701d (patch)
tree026f36788e0ab7863145888f72edcc64e64106f5 /Makefile
parent17d76ee4780167f53f9f342ce9cbacbe619311a7 (diff)
downloadnetsurf-048249f71d337274ce8cf1bcf698f700599f701d.tar.gz
netsurf-048249f71d337274ce8cf1bcf698f700599f701d.tar.bz2
Build libparserutils (and NetSurf) against libiconv instead of newlib's iconv.
This fixes the bug with lpu's iconv filter causing freezing on OS4 NetSurf. With an appropriate font (eg. Bitstream Cyberbit) Japanese characters will now display. Test websites work, but proper Japanese websites cause an assert which may be caused by amiga/font.c incorrect text size calculations. svn path=/trunk/netsurf/; revision=10546
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6e4c90ee0..29c41bdf9 100644
--- a/Makefile
+++ b/Makefile
@@ -517,14 +517,13 @@ ifeq ($(TARGET),amiga)
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga
- LDFLAGS += -lxml2 -ldl -lcurl -lpthread -lregex -lauto
+ LDFLAGS += -lxml2 -ldl -lcurl -lpthread -lregex -liconv -lauto
LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
LDFLAGS += -use-dynld -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
SUBTARGET := -cairo
- EXETARGET := NetSurf_Cairo
endif
endif