[Scummvm-git-logs] scummvm master -> 13a3d522ed8e4dbe58df1ad3e3aff5f61f83c7ea
zeldin
marcus at mc.pp.se
Wed Dec 5 22:53:02 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:
13a3d522ed BUILD: Also add $LIBS in cc_check()
Commit: 13a3d522ed8e4dbe58df1ad3e3aff5f61f83c7ea
https://github.com/scummvm/scummvm/commit/13a3d522ed8e4dbe58df1ad3e3aff5f61f83c7ea
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2018-12-05T22:50:03+01:00
Commit Message:
BUILD: Also add $LIBS in cc_check()
This should hopefully fix the problems caused by -Dmain=SDL_main in
the MinGW build.
Changed paths:
configure
diff --git a/configure b/configure
index 0152e9c..79a2421 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 -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
+ echo "$CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES $TMPC $LIBS -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
rm -f "$TMPO$HOSTEXEEXT"
if test "-c" = "$*" ; then
( $CXX $CXXFLAGS $DEFINES $INCLUDES "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
else
- ( $CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
+ ( $CXX $LDFLAGS $CXXFLAGS $DEFINES $INCLUDES "$TMPC" $LIBS -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
fi
TMPR="$?"
echo "return code: $TMPR" >> "$TMPLOG"
More information about the Scummvm-git-logs
mailing list