cpp/openttd-patchpack/source Changeset - r9724:5f0524f8d6c3

Changeset - r9724:5f0524f8d6c3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

bjarni - 16 years ago 2008-07-27 14:16:24
bjarni@openttd.org

(svn r13849) -Fix: [OSX] 10.5 appears to be more picky when setting up compiling of universal binaries

2 files changed with 3 insertions and 3 deletions:

config.lib

src/unix.cpp

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -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"

src/unix.cpp

➞

Show inline comments

@@ @@ -144,7 +144,7 @@ static const char *convert_tofrom_fs(ico @@
 	/* 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;

0 comments (0 inline, 0 general)