[Scummvm-cvs-logs] scummvm master -> bd253a62aca2a0571ad61a3167278d3c5437467a

[lordhoto]

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:
bd253a62ac BUILD: Support newer MinGW compilers.


Commit: bd253a62aca2a0571ad61a3167278d3c5437467a
    https://github.com/scummvm/scummvm/commit/bd253a62aca2a0571ad61a3167278d3c5437467a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-08T07:16:59-07:00

Commit Message:
BUILD: Support newer MinGW compilers.

It seems the recent MinGW gcc versions use the "TMP" env variable to determine
the temporary file path. Since we use that variable to hold temporary values it
will make g++ crash since it cannot access the path.

I "fixed" that problem by renaming the TMP variable we use to TMPR.

Tested with mingw-g++ 4.5.2.

Changed paths:
    configure



diff --git a/configure b/configure
index be1220c..75a64e0 100755
--- a/configure
+++ b/configure
@@ -218,10 +218,10 @@ cc_check_no_clean() {
 	echo "$CXX $LDFLAGS $CXXFLAGS $TMPC -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
 	rm -f "$TMPO$HOSTEXEEXT"
 	( $CXX $LDFLAGS $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
-	TMP="$?"
-	echo "return code: $TMP" >> "$TMPLOG"
+	TMPR="$?"
+	echo "return code: $TMPR" >> "$TMPLOG"
 	echo >> "$TMPLOG"
-	return "$TMP"
+	return "$TMPR"
 }
 
 cc_check_clean() {
@@ -230,9 +230,9 @@ cc_check_clean() {
 
 cc_check() {
 	cc_check_no_clean "$@"
-	TMP="$?"
+	TMPR="$?"
 	cc_check_clean
-	return "$TMP"
+	return "$TMPR"
 }
 
 cc_check_define() {
@@ -1462,21 +1462,21 @@ EOF
 #
 echo_n "Type with 1 byte... "
 type_1_byte=`find_type_with_size 1`
-TMP="$?"
+TMPR="$?"
 echo "$type_1_byte"
-test $TMP -eq 0 || exit 1	# check exit code of subshell
+test $TMPR -eq 0 || exit 1	# check exit code of subshell
 
 echo_n "Type with 2 bytes... "
 type_2_byte=`find_type_with_size 2`
-TMP="$?"
+TMPR="$?"
 echo "$type_2_byte"
-test $TMP -eq 0 || exit 1	# check exit code of subshell
+test $TMPR -eq 0 || exit 1	# check exit code of subshell
 
 echo_n "Type with 4 bytes... "
 type_4_byte=`find_type_with_size 4`
-TMP="$?"
+TMPR="$?"
 echo "$type_4_byte"
-test $TMP -eq 0 || exit 1	# check exit code of subshell
+test $TMPR -eq 0 || exit 1	# check exit code of subshell
 
 #
 # Check whether we can use x86 asm routines