From 3ebf7b62860f07de3107d89745dcd0b11451fbf0 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
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.
---
 fgrun                       | 2 +-
 flightgear                  | 2 +-
 hudson_mac_build_release.sh | 9 +++++++--
 maclauncher                 | 2 +-
 simgear                     | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/fgrun b/fgrun
index ae0b0fe..90e936c 160000
--- a/fgrun
+++ b/fgrun
@@ -1 +1 @@
-Subproject commit ae0b0fef3615a9a2d243da5b566ea3b221f7a6c2
+Subproject commit 90e936c01e28feac4a9c3e28d5227980fb8f1e1d
diff --git a/flightgear b/flightgear
index 4873a28..ea81903 160000
--- a/flightgear
+++ b/flightgear
@@ -1 +1 @@
-Subproject commit 4873a28e9721f637870f28b70e19d2c4b4647da3
+Subproject commit ea81903f6707bb50a362bca64e005bf47f443a8c
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
diff --git a/maclauncher b/maclauncher
index 7ffef2c..3692e79 160000
--- a/maclauncher
+++ b/maclauncher
@@ -1 +1 @@
-Subproject commit 7ffef2cb26442578f3c4b1e22158feb1ad812367
+Subproject commit 3692e79f7dbc2c0d8a98a04da6ac55684185eb67
diff --git a/simgear b/simgear
index 724fba4..ea8023e 160000
--- a/simgear
+++ b/simgear
@@ -1 +1 @@
-Subproject commit 724fba4af9ebdc6a684d6c4a47d4f6af2f31f386
+Subproject commit ea8023e51f17d2213d4f61548a91eb403e322656