cpp/openttd-patchpack/source Changeset - r20465:2e3ff3291a72

Changeset - r20465:2e3ff3291a72

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

michi_cc - 11 years ago 2013-06-26 21:17:09
michi_cc@openttd.org

(svn r25480) -Codechange: [OSX] OS X SDK versions >= 10.5 always have a non-const iconv declaration.

2 files changed with 7 insertions and 2 deletions:

config.lib

src/os/macosx/osx_stdafx.h

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1751,13 +1751,13 @@ make_cflags_and_ldflags() { @@
 			if [ "$with_iconv" != "2" ]; then
 				CFLAGS="$CFLAGS -I$with_iconv/include"
 				LIBS="$LIBS -L$with_iconv/lib"
 			fi
 		fi
 		if [ "$have_non_const_iconv" != "no" ]; then
+		if [ "$os" != "OSX" ] && [ "$have_non_const_iconv" != "no" ]; then
 			CFLAGS="$CFLAGS -DHAVE_NON_CONST_ICONV"
 		fi
 	fi
 	if [ -n "$with_midi" ]; then
 		CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\\\\\"$with_midi\\\\\""
@@ @@ -3485,13 +3485,13 @@ generate_src_osx() { @@
 			# 64 bits is always 10.5 or higher. Furthermore it has a non const ICONV
 			# and they also removed support for QuickTime/QuickDraw
 			if [ -n "$osx_sdk_path" ]; then
 				CFLAGS="-isysroot $osx_sdk_path $CFLAGS_orig"
 				LDFLAGS="-Wl,-syslibroot,$osx_sdk_path $LDFLAGS_orig"
 			fi
-			CFLAGS="$CFLAGS -D_SQ64 -DHAVE_NON_CONST_ICONV -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
 			CFLAGS="$CFLAGS -D_SQ64 -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
 			LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
 		fi
 		case $type in
 			ppc)
 				BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"

src/os/macosx/osx_stdafx.h

➞

Show inline comments

@@ @@ -74,7 +74,12 @@ typedef unsigned long NSUInteger; @@
 #else
 typedef int NSInteger;
 typedef unsigned int NSUInteger;
 #endif /* __LP64__ */
 #endif /* NSInteger */
 /* OS X SDK versions >= 10.5 have a non-const iconv. */
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 #	define HAVE_NON_CONST_ICONV
 #endif
 #endif /* MACOS_STDAFX_H */

0 comments (0 inline, 0 general)