Use the current OS X version instead of a hardcoded value in the path to the OSX development tools, when building the OSX bundle.
Patch by jurgemaister, plus some little fixes, fixes #3884. Tested on OSX 10.11. This was SVN commit r18726.
This commit is contained in:
parent
c92e74138a
commit
72a26857e9
@ -102,6 +102,7 @@
|
||||
{"nick": "jP_wanN", "name": "Jonas Platte"},
|
||||
{"nick": "Jubalbarca", "name": "James Baillie"},
|
||||
{"nick": "JubJub", "name": "Sebastian Vetter"},
|
||||
{"nick": "jurgemaister"},
|
||||
{"nick": "kabzerek", "name": "Grzegorz Kabza"},
|
||||
{"nick": "Kai", "name": "Kai Chen"},
|
||||
{"name": "Kareem Ergawy"},
|
||||
|
@ -22,12 +22,13 @@
|
||||
# Choices are "x86_64" or "i386" (ppc and ppc64 not supported)
|
||||
export ARCH=${ARCH:="x86_64"}
|
||||
|
||||
OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"`
|
||||
# Set SDK and mimimum required OS X version
|
||||
export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"}
|
||||
export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"}
|
||||
export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"}
|
||||
|
||||
# 0 A.D. release version, e.g. Alpha 18 is 0.0.18
|
||||
BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.18"}
|
||||
# 0 A.D. release version, e.g. Alpha 21 is 0.0.21
|
||||
BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.X"}
|
||||
|
||||
# Define compiler as "clang", this is all Mavericks supports.
|
||||
# gcc symlinks may still exist, but they are simply clang with
|
||||
@ -103,7 +104,7 @@ BUNDLE_SHAREDSUPPORT=$BUNDLE_CONTENTS/SharedSupport
|
||||
# TODO: Do we really want to regenerate everything? (consider if one task fails)
|
||||
|
||||
# Build libraries against SDK
|
||||
echo "\nBuilding libaries\n"
|
||||
echo "\nBuilding libraries\n"
|
||||
pushd ../../libraries/osx > /dev/null
|
||||
./build-osx-libs.sh $JOBS --force-rebuild >> $build_log 2>&1 || die "Libraries build script failed"
|
||||
popd > /dev/null
|
||||
|
Loading…
Reference in New Issue
Block a user