gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-03 04:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bjarni 2008-07-27 14:16:24 +00:00
parent 80725edc3d
commit 62c053729a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.lib
View File

@ -1286,7 +1286,7 @@ make_cflags_and_ldflags() {
if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then
CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk" 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 fi
if [ -n "$personal_dir" ]; then if [ -n "$personal_dir" ]; then
@ -2247,7 +2247,7 @@ make_sed() {
T_LDFLAGS="$LDFLAGS" T_LDFLAGS="$LDFLAGS"
if [ "$with_osx_sysroot" = "3" ]; then if [ "$with_osx_sysroot" = "3" ]; then
T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk" 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 fi
SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR" SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"

2
src/unix.cpp
View File

@ -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 /* Work around buggy iconv implementation where inbuf is wrongly typed as
* non-const. Correct implementation is at * non-const. Correct implementation is at
* http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */ * http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html */
#ifdef HAVE_BROKEN_ICONV #if defined(HAVE_BROKEN_ICONV) && !defined(__APPLE__)
char *inbuf = (char*)name; char *inbuf = (char*)name;
#else #else
const char *inbuf = name; const char *inbuf = name;