[Scummvm-git-logs] scummvm master -> 93fcfdebdbefdde16bcc28a98297e21cc2e6e245

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
852e9b550d CONFIGURE: Make MacOS version check more robust
93fcfdebdb CONFIGURE: Better compatibility with some bash versions


Commit: 852e9b550d9242fc6b4b5d50a3342031f15766ea
    https://github.com/scummvm/scummvm/commit/852e9b550d9242fc6b4b5d50a3342031f15766ea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-15T13:12:38+01:00

Commit Message:
CONFIGURE: Make MacOS version check more robust

Changed paths:
    configure


diff --git a/configure b/configure
index e859bae615..8165aa846c 100755
--- a/configure
+++ b/configure
@@ -2906,21 +2906,15 @@ case $_host_os in
 		# A workaround is to set the LC_VERSION_MIN_MACOSX load command's sdk value
 		# to n/a (i.e. 0.0). See bug #11430 for details.
 		echocheck "macOS deployement target"
-		_macos_min_version=undefined
-		for _macos_min_version_check in 1030 1040 1050 1060 1070 1080 1090 101000 101100 101200 101300 101400 101500 101600; do
-			cat > $TMPC << EOF
+		cat > $TMPC << EOF
 #include "AvailabilityMacros.h"
-#if MAC_OS_X_VERSION_MIN_REQUIRED > ${_macos_min_version_check}
-error
-#endif
-int main(int argc, char *argv[]) { return 0; }
+#include <stdio.h>
+int main(int argc, char *argv[]) { printf("%d\n", MAC_OS_X_VERSION_MIN_REQUIRED); return 0; }
 EOF
-			cc_check
-			if test "$TMPR" -eq 0; then
-				_macos_min_version=$_macos_min_version_check
-				break
-			fi
-		done
+		cc_check_no_clean
+		_macos_min_version=`$TMPO$HOSTEXEEXT`
+		cc_check_clean
+
 		# Also get a dot version of the min version
 		_macos_min_version_dot=undefined
 		if test "$_macos_min_version" != undefined ; then


Commit: 93fcfdebdbefdde16bcc28a98297e21cc2e6e245
    https://github.com/scummvm/scummvm/commit/93fcfdebdbefdde16bcc28a98297e21cc2e6e245
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-15T13:12:38+01:00

Commit Message:
CONFIGURE: Better compatibility with some bash versions

Changed paths:
    configure


diff --git a/configure b/configure
index 8165aa846c..80429fc862 100755
--- a/configure
+++ b/configure
@@ -2912,12 +2912,12 @@ case $_host_os in
 int main(int argc, char *argv[]) { printf("%d\n", MAC_OS_X_VERSION_MIN_REQUIRED); return 0; }
 EOF
 		cc_check_no_clean
-		_macos_min_version=`$TMPO$HOSTEXEEXT`
+		_macos_min_version=`$TMPO$HOSTEXEEXT 2>/dev/null`
 		cc_check_clean
 
 		# Also get a dot version of the min version
 		_macos_min_version_dot=undefined
-		if test "$_macos_min_version" != undefined ; then
+		if test -n "$_macos_min_version" ; then
 			if test "$_macos_min_version" -lt 101000; then
 				_macos_min_ver_major=$((${_macos_min_version}/100))
 				_macos_min_ver_minor=$((${_macos_min_version}/10 - 10*${_macos_min_ver_major}))
@@ -2947,15 +2947,18 @@ EOF
 			append_var LDFLAGS "$_macos_ldflags_platform_version"
 		fi
 
-		# When building for MacOS X 10.5 or below we need to use the legacy icon
-		if test "$_macos_min_version" != undefined -a "$_macos_min_version" -lt 1060 ; then
-			add_line_to_config_mk 'MACOSX_USE_LEGACY_ICONS = 1'
-		fi
+		# Version-specific quirks
+		if test -n "$_macos_min_version" ; then
+			# When building for MacOS X 10.5 or below we need to use the legacy icon
+			if test "$_macos_min_version" -lt 1060 ; then
+				add_line_to_config_mk 'MACOSX_USE_LEGACY_ICONS = 1'
+			fi
 
-		# When building with SDK 10.14 or above, we cannot compile the 32 bits dock plugin
-		# Assume the SDK version is the same as the min version.
-		if test "$_macos_min_version" != undefined -a "$_macos_min_version" -gt 101399 ; then
-			add_line_to_config_mk 'MACOSX_64_BITS_ONLY = 1'
+			# When building with SDK 10.14 or above, we cannot compile the 32 bits dock plugin
+			# Assume the SDK version is the same as the min version.
+			if test "$_macos_min_version" -gt 101399 ; then
+				add_line_to_config_mk 'MACOSX_64_BITS_ONLY = 1'
+			fi
 		fi
 
 		# Use pandoc to generate README and NEWS file for the bundle