aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMarcus Comstedt2018-12-06 09:28:40 +0100
committerMarcus Comstedt2018-12-06 09:30:09 +0100
commitf6258e229ce0d92d126c5ec827e28b5b21066b8c (patch)
tree9e504a0c78ebbba979d05d605655de6a23442920 /configure
parent13a3d522ed8e4dbe58df1ad3e3aff5f61f83c7ea (diff)
downloadscummvm-rg350-f6258e229ce0d92d126c5ec827e28b5b21066b8c.tar.gz
scummvm-rg350-f6258e229ce0d92d126c5ec827e28b5b21066b8c.tar.bz2
scummvm-rg350-f6258e229ce0d92d126c5ec827e28b5b21066b8c.zip
BUILD: Revert f4fe15fd4d and a85be202de
More work is needed to make this function correctly with SDL on MinGW. Reverting for now.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 79a2421c5e..493573f02c 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"