diff options
| -rw-r--r-- | Docs/BUILDING-AmigaOS | 7 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.defaults | 4 | ||||
| -rwxr-xr-x | amiga/pkg/makepackage | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS index 6eb8a3bb4..ef9b40595 100644 --- a/Docs/BUILDING-AmigaOS +++ b/Docs/BUILDING-AmigaOS @@ -69,12 +69,15 @@ 1> gmake install - | Note: We advise enabling ivonv() support in libparserutils, which vastly + | Note: We advise enabling iconv() support in libparserutils, which vastly | increases the number of supported character sets. To do this, | create a file called Makefile.config.override in the libparserutils - | directory, containing the following line: + | directory, containing the following lines: | | CFLAGS += -DWITH_ICONV_FILTER + | LDFLAGS += -liconv + | + | This requires libiconv as iconv support in newlib.library is buggy. | | For more information, consult the libparserutils README file. @@ -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 diff --git a/Makefile.defaults b/Makefile.defaults index 0fa7c2ead..e6f26b315 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -189,6 +189,10 @@ endif # ---------------------------------------------------------------------------- ifeq ($(TARGET),amiga) + # Force using glibc internal iconv implementation instead of external libiconv + # Valid options: YES, NO + NETSURF_USE_LIBICONV_PLUG := NO + # Enable NetSurf's use of librosprite for displaying RISC OS Sprites # Valid options: YES, NO, AUTO NETSURF_USE_ROSPRITE := YES diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage index b04d4196d..701847732 100755 --- a/amiga/pkg/makepackage +++ b/amiga/pkg/makepackage @@ -13,13 +13,13 @@ delete ram:netsurf/resources/options copy resources/Pointers/~(.svn) ram:NetSurf/Resources/Pointers copy (COPYING|ChangeLog) ram:NetSurf/ copy NetSurf ram:NetSurf/NetSurf -copy NetSurf_Cairo ram:NetSurf/NetSurf_Cairo +copy NetSurf-Cairo ram:NetSurf/NetSurf-Cairo copy amiga/dist/AutoInstall ram: copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/ 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 sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.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 ram:NetSurf/SObjs clone +copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.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 ram:NetSurf/SObjs clone ;sobjs:libssl-0.9.8.so sobjs:libexpat.so sobjs:libpng14.so.14 ;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so
\ No newline at end of file |