diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-03-31 21:22:41 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-03-31 21:22:41 +0000 |
| commit | 38cd74a0bdd12960f0b367b5c868e12180907167 (patch) | |
| tree | 34805e5eb4958f93fa008df7f69434abe3975ed7 /unix.c | |
| parent | b2cf79423dd432c957a581b387a642f8a574a7ab (diff) | |
| download | openttd-38cd74a0bdd12960f0b367b5c868e12180907167.tar.xz | |
(svn r4219) - Add support for WITH_ICONV. It is enabled by default for OSX > 10.3 for all others set it with WITH_ICONV in Makefile.config or with --with-iconv with configure. --with-config=/somedir will search for iconv include files somewhere (or in Makefile.config with WITH_ICONV_PATH). Custom library loading is not (yet) supported
Diffstat (limited to 'unix.c')
| -rw-r--r-- | unix.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -603,11 +603,6 @@ void CSleep(int milliseconds) #endif // __AMIGA__ } -// No proper makefile detection, so just force this for the time being -#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3) -# define WITH_ICONV -#endif - #ifdef WITH_ICONV #include <iconv.h> @@ -621,7 +616,7 @@ void CSleep(int milliseconds) * locale can be found, don't do any conversion "" */ static const char *GetLocalCode(void) { -#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3) +#if defined(__APPLE__) return "UTF-8-MAC"; #else /* Strip locale (eg en_US.UTF-8) to only have UTF-8 */ |