[Scummvm-git-logs] scummvm master -> 7e3d5513217b450a2518a04f2ede25c2b2d190f1

sev- noreply at scummvm.org
Tue Feb 7 23:50:37 UTC 2023


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

Summary:
7e3d551321 DC: BUILD: Always disable SCUMMv7+ on Dreamcast (Bug#6008)


Commit: 7e3d5513217b450a2518a04f2ede25c2b2d190f1
    https://github.com/scummvm/scummvm/commit/7e3d5513217b450a2518a04f2ede25c2b2d190f1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-02-08T00:50:33+01:00

Commit Message:
DC: BUILD: Always disable SCUMMv7+ on Dreamcast (Bug#6008)

With the recent v7/v8 changes in the SCUMM engine, trying to run a v7/v8
SCUMM game is not a nice user experience anymore, because the game just
won't fit in the limited default memory available on Dreamcast anymore.

This is also a problem for some other engines on this platform, but the
SCUMM engine being one of the most popular engines, quite a lot of users
end up burning a toast CD-R on their Dreamcast until they figure out
that only SCUMMv6 and earlier still work nowadays (with some limitations
too).  Disabling v7/v8 from the SCUMM engine plugin should also free up
some memory for a better experience with earlier SCUMM titles.

Changed paths:
    backends/platform/dc/Makefile
    configure


diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile
index 50e17aa4da0..2959181bcfb 100644
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@ -42,7 +42,8 @@ ENABLED=STATIC_PLUGIN
 endif
 
 ENABLE_SCUMM = $(ENABLED)
-ENABLE_SCUMM_7_8 = $(ENABLED)
+# Not meaningful anymore (bug #6008)
+#ENABLE_SCUMM_7_8 = $(ENABLED)
 ENABLE_HE = $(ENABLED)
 ENABLE_AGI = $(ENABLED)
 ENABLE_AGOS = $(ENABLED)
diff --git a/configure b/configure
index 3a84a798754..6e469b338b3 100755
--- a/configure
+++ b/configure
@@ -1513,8 +1513,8 @@ for ac_option in $@; do
 	*)
 		option_error
 		;;
-	esac;
-done;
+	esac
+done
 
 guessed_host=`$_srcdir/config.guess`
 get_system_exe_extension $guessed_host
@@ -2282,7 +2282,7 @@ else
 fi
 
 # Check if std::nullptr_t is available
-echo_n "Checking if C++11 std::nullptr_t is available..."
+echo_n "Checking if C++11 std::nullptr_t is available... "
 cat > $TMPC << EOF
 #include <cstddef>
 int main(int argc, char *argv[]) {
@@ -2292,10 +2292,10 @@ int main(int argc, char *argv[]) {
 EOF
 cc_check
 if test "$TMPR" -eq 0; then
-		echo yes
+	echo yes
 else
-		echo no
-		define_in_config_if_yes yes 'NO_CXX11_NULLPTR_T'
+	echo no
+	define_in_config_if_yes yes 'NO_CXX11_NULLPTR_T'
 fi
 
 #
@@ -2945,6 +2945,12 @@ EOF
 		if test "$_dynamic_modules" = yes ; then
 			_detection_features_static=no
 		fi
+		# XXX: Enabling SCUMM v7+ hasn't been useful on DC for many years (bug #6008),
+		# and may confuse users, since this is one of the most popular engines, so make
+		# sure that it won't be enabled (until a better backend capability requirement
+		# feature is implemented). This may also help SCUMMv6 and below behave better
+		# on this very memory-limited platform.
+		engine_disable scumm_7_8
 		;;
 	ds)
 		_optimization_level=-Os




More information about the Scummvm-git-logs mailing list