(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

This commit is contained in:
Darkvater
2006-03-31 21:22:41 +00:00
parent b2cf79423d
commit 38cd74a0bd
4 changed files with 26 additions and 8 deletions

7
unix.c
View File

@@ -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 */