From bac9b55f06041a63ea16c02ae5b8de31e3549d60 Mon Sep 17 00:00:00 2001 From: James Turner Date: Fri, 4 Jan 2013 14:37:55 +0000 Subject: [PATCH] Disable explicit SDK setting for Mac launcher. Setting an SDK is breaking, but since the build slave is running our lowest supported OS version anyway, we can live with the default setting. --- hudson_mac_build_release.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 8b7592e..ae2afac 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -49,12 +49,17 @@ chmod +x $WORKSPACE/dist/bin/osgversion ################################################################################ echo "Building Macflightgear launcher" -OSX_TARGET="10.6" +#OSX_TARGET="10.6" +# JMT - disabling setting the sysroot since it's breaking things on +# current build slave. Sinc ethe slave runs 10.6 natively, we don't +# actually need to set these. Real solution would be to use a proper +# build system for the Mac-launcher of course. +# -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH pushd maclauncher/FlightGearOSX # compile the stub executable -gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH main.m \ +gcc -o FlightGear main.m \ -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit popd