← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/bug-1817607-macos-build into lp:widelands

 

I can only test this with a newer Mac. SirVer needs to test this on his old one, though. For the nit see inline.

Diff comments:

> === modified file 'utils/macos/build_app.sh'
> --- utils/macos/build_app.sh	2018-12-13 21:27:09 +0000
> +++ utils/macos/build_app.sh	2019-03-09 10:20:12 +0000
> @@ -62,9 +62,14 @@
>  # If not, use the one for the installed macOS Version
>  OSX_MIN_VERSION="10.7"

OSX_MIN_VERSION gets initialized here.

>  SDK_DIRECTORY="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_MIN_VERSION.sdk"
> +
> +OSX_VERSION=$(sw_vers -productVersion | cut -d . -f 1,2)
> +OSX_MINOR=$(sw_vers -productVersion | cut -d . -f 2)
> +
>  if [ ! -d "$SDK_DIRECTORY" ]; then
> -   OSX_VERSION=$(sw_vers -productVersion | cut -d . -f 1,2)
> -   OSX_MIN_VERSION=$OSX_VERSION
> +   if [ "$OSX_MINOR" -ge 9 ]; then
> +      OSX_MIN_VERSION="10.9"
> +   fi
>     SDK_DIRECTORY="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"
>     if [ ! -d "$SDK_DIRECTORY" ]; then
>        # If the SDK for the current macOS Version can't be found, use whatever is linked to MacOSX.sdk


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1817607-macos-build/+merge/364204
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817607-macos-build.


References