diff options
| author | bjarni <bjarni@openttd.org> | 2006-03-23 23:54:43 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-03-23 23:54:43 +0000 |
| commit | 10936e70345e4d462517e35511f0e56b69c444e9 (patch) | |
| tree | 6ffab345b4e5937c329ed5663a3b4bd2a268b369 /os/macosx | |
| parent | 541703a2f6687fcb7d9f4d1453f84d80b67cd58c (diff) | |
| download | openttd-10936e70345e4d462517e35511f0e56b69c444e9.tar.xz | |
(svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is present in the system
if detected, WITH_ICONV will be defined in the C code
WITH_ICONV is also added to Makefile.config
OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version
the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv
This detection system is by request of Darkvater
Diffstat (limited to 'os/macosx')
| -rw-r--r-- | os/macosx/Makefile.setup | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 159bf0aa5..92969ae43 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -84,3 +84,10 @@ $(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector) endif endif endif + +# the OSX port need Apple's modified iconv to use the charset UTF-8-MAC. This was added by default in 10.3, but is not present in earlier versions +ifdef JAGUAR + WITH_ICONV:= +else + WITH_ICONV:=1 +endif |