Changeset - r20465:2e3ff3291a72
[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:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -1754,7 +1754,7 @@ make_cflags_and_ldflags() {
 
			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
 
@@ -3488,7 +3488,7 @@ generate_src_osx() {
 
				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
 

	
src/os/macosx/osx_stdafx.h
Show inline comments
 
@@ -77,4 +77,9 @@ 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)