[Scummvm-git-logs] scummvm master -> 02377d632a97a32133559ea5c7d0e67cd27da828

[lephilousophe]

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:
ca2ba5ff14 CONFIGURE: Don't use [ command
02377d632a CONFIGURE: Allow to enable all subengines of an engine


Commit: ca2ba5ff144f4d00c4741c7dfb8776a0e9a53c8d
    https://github.com/scummvm/scummvm/commit/ca2ba5ff144f4d00c4741c7dfb8776a0e9a53c8d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-11-10T08:19:23+01:00

Commit Message:
CONFIGURE: Don't use [ command

It wasn't used elsewhere and is the same as test

Changed paths:
    configure


diff --git a/configure b/configure
index dcfc3c28692..70d6ca4ccae 100755
--- a/configure
+++ b/configure
@@ -3699,7 +3699,7 @@ case $_backend in
 		append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation"
 		append_var LIBS "-framework AudioToolbox -framework CoreAudio -framework SystemConfiguration "
 		append_var LIBS "-framework GameController"
-		if [ $_host_cpu = 'aarch64' ]; then
+		if test "$_host_cpu" = 'aarch64' ; then
 			append_var LDFLAGS "-miphoneos-version-min=7.1 -arch arm64"
 			append_var CFLAGS "-miphoneos-version-min=7.1 -arch arm64"
 			append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch arm64"


Commit: 02377d632a97a32133559ea5c7d0e67cd27da828
    https://github.com/scummvm/scummvm/commit/02377d632a97a32133559ea5c7d0e67cd27da828
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-11-10T08:19:23+01:00

Commit Message:
CONFIGURE: Allow to enable all subengines of an engine

By specifying -all (or _all) at the end of the engine in --enable-engine, all of
its subengines get enabled too.

Changed paths:
    configure


diff --git a/configure b/configure
index 70d6ca4ccae..26db2f3808a 100755
--- a/configure
+++ b/configure
@@ -692,15 +692,30 @@ engine_enable() {
 		fi
 	fi
 
-	if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then
-		if test "`get_engine_name ${engine}`" != "" ; then
-			set_var _engine_${engine}_build "$opt"
-		else
-			engine_option_error ${engine}
-		fi
-	else
+	if test "$opt" != "static" -a "$opt" != "dynamic" -a "$opt" != "yes" ; then
 		option_error
+		return
+	fi
+
+	subengines=
+	if test "${engine%_all}" != "${engine}" ; then
+		engine="${engine%_all}"
+		subengines=$(get_engine_subengines ${engine})
+		if test "$subengines" = "" ; then
+			engine_option_error "${engine}*"
+			return
+		fi
 	fi
+
+	if test "`get_engine_name ${engine}`" = "" ; then
+		engine_option_error ${engine}
+		return
+	fi
+
+	set_var _engine_${engine}_build "$opt"
+	for subengine in $subengines ; do
+		set_var _engine_${subengine}_build "$opt"
+	done
 }
 
 # Disable the given engine