summaryrefslogtreecommitdiff
path: root/amiga/Makefile.defaults
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-20 20:03:55 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-20 20:03:55 +0000
commitd0f7247ea67491b4bfae28cb90538b68c6f83d70 (patch)
tree5a11197792c9d5a1279b38c5d24acdfa4b9dfa85 /amiga/Makefile.defaults
parent65ab38fc1c26bed356fc61dd4adfe1f0495fab65 (diff)
parent2b9df1b2cd30e394ebb4e9be721b7d219c4e418c (diff)
downloadnetsurf-d0f7247ea67491b4bfae28cb90538b68c6f83d70.tar.gz
netsurf-d0f7247ea67491b4bfae28cb90538b68c6f83d70.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'amiga/Makefile.defaults')
-rw-r--r--amiga/Makefile.defaults6
1 files changed, 5 insertions, 1 deletions
diff --git a/amiga/Makefile.defaults b/amiga/Makefile.defaults
index 2134e8373..243e44b38 100644
--- a/amiga/Makefile.defaults
+++ b/amiga/Makefile.defaults
@@ -4,7 +4,11 @@
# Force using glibc internal iconv implementation instead of external libiconv
# Valid options: YES, NO
-NETSURF_USE_LIBICONV_PLUG := YES
+ifneq ($(SUBTARGET),os3)
+ NETSURF_USE_LIBICONV_PLUG := YES
+else
+ NETSURF_USE_LIBICONV_PLUG := NO
+endif
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO