diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a91824c8b..e65c149ddf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,7 +241,7 @@ endif() if(UNIX OR MINGW OR MSYS OR (USE_CLANG AND NOT WINDOWS) OR VITA OR PSP OR PS2 OR N3DS) set(OPT_DEF_LIBC ON) endif() -if(WINDOWS OR IOS OR TVOS) +if(WINDOWS OR DARWIN OR MACOSX OR IOS OR TVOS) set(SDL_SYSTEM_ICONV_DEFAULT OFF) else() set(SDL_SYSTEM_ICONV_DEFAULT ON) diff --git a/configure b/configure index 8183ec88c2..2a004fef2c 100755 --- a/configure +++ b/configure @@ -18816,7 +18816,7 @@ fi enable_system_iconv_default=yes case "$host" in - *-*-cygwin*|*-*-mingw*) + *-*-cygwin*|*-*-mingw*|*-*-darwin*|*-ios-*) enable_system_iconv_default=no ;; esac diff --git a/configure.ac b/configure.ac index 631ea773e7..a968c4c606 100644 --- a/configure.ac +++ b/configure.ac @@ -322,7 +322,7 @@ AC_ARG_ENABLE(libc, dnl See whether we are allowed to use system iconv enable_system_iconv_default=yes case "$host" in - *-*-cygwin*|*-*-mingw*) + *-*-cygwin*|*-*-mingw*|*-*-darwin*|*-ios-*) enable_system_iconv_default=no ;; esac