mirror of
https://github.com/mpv-player/mpv
synced 2025-04-01 00:07:33 +00: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:
parent
8830acfc73
commit
3ae81e84be
8
configure
vendored
8
configure
vendored
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user