summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2008-07-27 14:16:24 +0000
committerbjarni <bjarni@openttd.org>2008-07-27 14:16:24 +0000
commit62c053729a8a096cbf0833ed2eb355822e3d18ee (patch)
treea372a4c0744ba855eede5a9990fe5283595368eb
parent80725edc3da3b3f30fdad9a71e69ec6b461ba6c0 (diff)
downloadopenttd-62c053729a8a096cbf0833ed2eb355822e3d18ee.tar.xz
(svn r13849) -Fix: [OSX] 10.5 appears to be more picky when setting up compiling of universal binaries
-rw-r--r--config.lib4
-rw-r--r--src/unix.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/config.lib b/config.lib
index 4f0d4a826..32ba6565f 100644
--- a/config.lib
+++ b/config.lib
@@ -1286,7 +1286,7 @@ make_cflags_and_ldflags() {
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 @@ make_sed() {
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"
diff --git a/src/unix.cpp b/src/unix.cpp
index 7fafd3d67..75dc25bd8 100644
--- a/src/unix.cpp
+++ b/src/unix.cpp
@@ -144,7 +144,7 @@ static const char *convert_tofrom_fs(iconv_t convd, const char *name)
/* 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;