more flexible Xcode management, reduce hard coded version numbers

This commit is contained in:
Stephan Witt 2016-01-06 10:14:39 +01:00
parent 7b4064bbcb
commit c098ee0c72

View File

@ -104,11 +104,11 @@ thesaurus_deployment="yes"
qt_deployment="yes" qt_deployment="yes"
# auto detect Xcode location # auto detect Xcode location
if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs" ]; then DEVELOPER_SDKS=$(dirname $(xcrun --show-sdk-path))
DEVELOPER_SDKS="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs" if [ -n "${DEVELOPER_SDKS}" ]; then
XCODE_DEVELOPER="/Applications/Xcode.app/Contents/Developer" XCODE_DEVELOPER=$(dirname $(dirname $(xcrun --show-sdk-platform-path)))
MACOSX_DEPLOYMENT_TARGET="10.7" # Lion support is default MACOSX_DEPLOYMENT_TARGET="10.7" # Lion support is default
SDKROOT="${DEVELOPER_SDKS}/MacOSX10.7.sdk" # Lion build is default SDKROOT="${DEVELOPER_SDKS}/MacOSX$(xcrun --show-sdk-version).sdk" # use default SDK
elif [ -d "/Developer/SDKs" ]; then elif [ -d "/Developer/SDKs" ]; then
DEVELOPER_SDKS="/Developer/SDKs" DEVELOPER_SDKS="/Developer/SDKs"
XCODE_DEVELOPER="/Developer" XCODE_DEVELOPER="/Developer"
@ -200,11 +200,12 @@ while [ $# -gt 0 ]; do
export OBJC=gcc-4.0 export OBJC=gcc-4.0
export CXX=g++-4.0 export CXX=g++-4.0
;; ;;
10.5|10.6|10.7|10.8|10.9|10.10)
SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
;;
*) *)
usage SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
if [ ! -d "${SDKROOT}" ]; then
echo Invalid SDKROOT given: "${SDKROOT}"
usage --help=short
fi
;; ;;
esac esac
shift shift