mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16824) -Fix [FS#2989] (r16294): Mac OS X 10.4 with Xcode 2.5 wouldn't be detected as having Xcode 2.5 or newer. Based on a patch by ln.

release/1.0
rubidium 2009-07-13 23:12:34 +00:00
parent f7c4711012
commit 0e1dc88b9b
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.lib
View File

@ -1651,24 +1651,22 @@ set_universal_binary_flags() {
} }
check_osx_sdk() { check_osx_sdk() {
cat > tmp.osx.cpp << EOF cat > tmp.osx.mm << EOF
#include <AvailabilityMacros.h> #include <Cocoa/Cocoa.h>
#if !defined(MAC_OS_X_VERSION_10_5)
# error "Need newer SDK"
#endif
int main() { int main() {
kCGBitmapByteOrder32Host;
return 0; return 0;
} }
EOF EOF
execute="$cxx_host $CFLAGS -E tmp.osx.cpp -o - 2>&1" execute="$cxx_host $CFLAGS tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1"
eval $execute > /dev/null eval $execute > /dev/null
ret=$? ret=$?
log 2 "executing $execute" log 2 "executing $execute"
log 2 " exit code $ret" log 2 " exit code $ret"
rm -f tmp.osx.cpp rm -f tmp.osx.mm tmp.osx
if [ "$ret" != "0" ]; then if [ "$ret" != "0" ]; then
log 1 "I couldn't detect any XCode >= 2.5 on your system" log 1 "Your system SDK is probably too old"
log 1 "please install/upgrade your XCode" log 1 "Please install/upgrade your Xcode to >= 2.5"
exit 1 exit 1
fi fi