Mercurial > hg > openttd
changeset 9724:62bd9318bda8 draft
(svn r13849) -Fix: [OSX] 10.5 appears to be more picky when setting up compiling of universal binaries
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Sun, 27 Jul 2008 14:16:24 +0000 |
| parents | 7f6ad9b49ad1 |
| children | 5b38d93ef486 |
| files | config.lib src/unix.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/config.lib +++ b/config.lib @@ -1286,7 +1286,7 @@ if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk" - LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk -mmacosx-version-min=10.4" fi if [ -n "$personal_dir" ]; then @@ -2247,7 +2247,7 @@ T_LDFLAGS="$LDFLAGS" if [ "$with_osx_sysroot" = "3" ]; then T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk" - T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk" + T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk -mmacosx-version-min=10.4" fi SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
--- a/src/unix.cpp +++ b/src/unix.cpp @@ -144,7 +144,7 @@ /* Work around buggy iconv implementation where inbuf is wrongly typed as * non-const. Correct implementation is at * http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */ -#ifdef HAVE_BROKEN_ICONV +#if defined(HAVE_BROKEN_ICONV) && !defined(__APPLE__) char *inbuf = (char*)name; #else const char *inbuf = name;