1
mirror of https://github.com/mpv-player/mpv synced 2024-08-04 14:59:58 +02:00

Change compiler argument order for compile_check to avoid incorrect linking

errors during detection with static libraries (in particular OpenGL + static SDL).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31282 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-05-30 12:14:40 +00:00
parent 8830acfc73
commit 3ae81e84be

8
configure vendored
View File

@ -59,12 +59,14 @@ _configuration="$*"
# Prefer these macros to full length text !
# These macros only return an error code - NO display is done
compile_check() {
source="$1"
shift
echo >> "$TMPLOG"
cat "$1" >> "$TMPLOG"
cat "$source" >> "$TMPLOG"
echo >> "$TMPLOG"
echo "$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
echo "$_cc $source $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
rm -f "$TMPEXE"
$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
$_cc $CFLAGS "$source" $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
TMPRES="$?"
echo >> "$TMPLOG"
echo >> "$TMPLOG"