[Scummvm-git-logs] scummvm master -> e0307e9c077154f9553d9c130eb6c16b29858f8c

[zeldin]

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:
f6258e229c BUILD: Revert f4fe15fd4d and a85be202de
e0307e9c07 BUILD: Re-introduce hardcoded libz and MAD on Dreacmast


Commit: f6258e229ce0d92d126c5ec827e28b5b21066b8c
    https://github.com/scummvm/scummvm/commit/f6258e229ce0d92d126c5ec827e28b5b21066b8c
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2018-12-06T09:30:09+01:00

Commit Message:
BUILD: Revert f4fe15fd4d and a85be202de

More work is needed to make this function correctly with SDL on MinGW.
Reverting for now.

Changed paths:
    configure


diff --git a/configure b/configure
index 79a2421..493573f 100755
--- a/configure
+++ b/configure
@@ -283,12 +283,12 @@ cc_check_no_clean() {
 	echo >> "$TMPLOG"
 	cat "$TMPC" >> "$TMPLOG"
 	echo >> "$TMPLOG"
-	echo "$CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES $TMPC $LIBS -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
+	echo "$CXX $LDFLAGS $CXXFLAGS $TMPC -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
 	rm -f "$TMPO$HOSTEXEEXT"
 	if test "-c" = "$*" ; then
-		( $CXX $CXXFLAGS $DEFINES $INCLUDES "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+		( $CXX $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
 	else
-		( $CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES "$TMPC" $LIBS -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+		( $CXX $LDFLAGS $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
 	fi
 	TMPR="$?"
 	echo "return code: $TMPR" >> "$TMPLOG"


Commit: e0307e9c077154f9553d9c130eb6c16b29858f8c
    https://github.com/scummvm/scummvm/commit/e0307e9c077154f9553d9c130eb6c16b29858f8c
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2018-12-06T09:36:45+01:00

Commit Message:
BUILD: Re-introduce hardcoded libz and MAD on Dreacmast

The attempts at making a more accurate auto-detection have been
postponed, so put the hardcoded enablers back for now.

Changed paths:
    configure


diff --git a/configure b/configure
index 493573f..7a06616 100755
--- a/configure
+++ b/configure
@@ -3072,6 +3072,11 @@ if test -n "$_host"; then
 			append_var CXXFLAGS "-fdelete-null-pointer-checks"
 			_backend="dc"
 			_build_scalers=no
+			# These two are needed due to shortcomings of the
+			# detection systems.  Do not remove until auto-
+			# detection works correctly.
+			_mad=yes
+			_zlib=yes
 			_port_mk="backends/platform/dc/dreamcast.mk"
 			;;
 		ds)