[Scummvm-cvs-logs] scummvm master -> 1e646c5470514e5b5f159b43d43eec442b3aec38

digitall dgturner at iee.org
Thu Jul 11 02:52:16 CEST 2013


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:
1e646c5470 DC: Amend tests on serial disable/enable blocks.


Commit: 1e646c5470514e5b5f159b43d43eec442b3aec38
    https://github.com/scummvm/scummvm/commit/1e646c5470514e5b5f159b43d43eec442b3aec38
Author: D G Turner (digitall at scummvm.org)
Date: 2013-07-10T17:53:06-07:00

Commit Message:
DC: Amend tests on serial disable/enable blocks.

These now restore the original release build logic to ensure that we
don't have issues with releases. Missing something here as _debug_build
doesn't seem to work as I expected...

Changed paths:
    configure



diff --git a/configure b/configure
index bf99149..7983f5a 100755
--- a/configure
+++ b/configure
@@ -2375,7 +2375,7 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
 			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			# Enable serial debugging output only when --enable-debug is passed
-			if test "$_debug_build" != yes; then
+			if test "$_release_build" = yes -o "$_debug_build" != yes; then
 				DEFINES="$DEFINES -DNOSERIAL"
 			fi
 			_optimization_level=-O3
@@ -2708,7 +2708,7 @@ case $_backend in
 		LDFLAGS="$LDFLAGS "'$(ronindir)/lib/crt0.o'
 		LDFLAGS="$LDFLAGS "'-L$(ronindir)/lib'
 		# Enable serial debugging output only when --enable-debug is passed
-		if test "$_debug_build" != yes; then
+		if test "$_release_build" = yes -o "$_debug_build" != yes; then
 			LIBS="$LIBS -lronin-noserial -lm"
 		else
 			LIBS="$LIBS -lronin -lm"






More information about the Scummvm-git-logs mailing list