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

zeldin marcus at mc.pp.se
Tue Dec 4 20:13:59 CET 2018


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:
e3da5e043c BUILD: Add $DEFINES and $INCLUDES in cc_check()


Commit: e3da5e043c873c241d142b688a646b268371a852
    https://github.com/scummvm/scummvm/commit/e3da5e043c873c241d142b688a646b268371a852
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2018-12-04T20:12:31+01:00

Commit Message:
BUILD: Add $DEFINES and $INCLUDES in cc_check()

When actually compiling things Makefile.common adds these variables to
the command line, so they should be there when testing if something
can be compiled as well, otherwise we could get both false negatives
and positives.

This fixes detection of zlib and MAD on Dreamcast, when installed in
$RONINDIR.

Changed paths:
    configure


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





More information about the Scummvm-git-logs mailing list