gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Target 10.9 as minimal OSX version in all scripts, in order to match the libraries build script.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D1685
Tested By: trompetin17
This was SVN commit r21942.
This commit is contained in:
Itms
2018-12-03 11:07:00 +00:00
parent fa1c281e79
commit 7115e4f9c7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/build-osx-bundle.sh
+1 -1
View File
@@ -25,7 +25,7 @@ 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/MacOSX$OSX_VERSION.sdk"}
export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"}
export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.9"}
# 0 A.D. release version, e.g. Alpha 21 is 0.0.21
BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.X"}
build/workspaces/update-workspaces.sh
+11 -7
View File
@@ -67,6 +67,9 @@ cd "$(dirname $0)"
# Now in build/workspaces/ (where we assume this script resides)
if [ "`uname -s`" = "Darwin" ]; then
# Set minimal SDK version
export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.9"}
# Set *_CONFIG variables on OS X, to override the path to e.g. sdl2-config
export GLOOX_CONFIG=${GLOOX_CONFIG:="$(pwd)/../../libraries/osx/gloox/bin/gloox-config"}
export ICU_CONFIG=${ICU_CONFIG:="$(pwd)/../../libraries/osx/icu/bin/icu-config"}
@@ -119,18 +122,19 @@ cd ..
export HOSTTYPE="$HOSTTYPE"
echo "Premake args: ${premake_args}"
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
if [ "$premake_version" = "premake4" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
fi
# Also generate xcode workspaces if on OS X
if [ "`uname -s`" = "Darwin" ]; then
if [ "`uname -s`" != "Darwin" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
else
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/gcc/" --macosx-version-min="${MIN_OSX_VERSION}" ${premake_args} gmake || die "Premake failed"
# Also generate xcode workspaces if on OS X
if [ "$premake_version" = "premake4" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/xcode3" ${premake_args} xcode3 || die "Premake failed"
fi
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
fi
if [ "$premake_version" = "premake4" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
fi
# test_root.cpp gets generated by cxxtestgen and passing different arguments to premake could require a regeneration of this file.
# It doesn't depend on anything in the makefiles, so make won't notice that the prebuild command for creating test_root.cpp needs to be triggered.