mirror of
https://github.com/mpv-player/mpv
synced 2024-12-26 17:12:36 +00:00
100l: Revert incorrect removal or --ar and --ranlib options.
They are still needed for FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27709 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b91df4ad96
commit
5fa09d26e0
18
configure
vendored
18
configure
vendored
@ -409,6 +409,8 @@ Miscellaneous options:
|
||||
--cc=COMPILER C compiler to build MPlayer [gcc]
|
||||
--host-cc=COMPILER C compiler for tools needed while building [gcc]
|
||||
--as=ASSEMBLER assembler to build MPlayer [as]
|
||||
--ar=AR librarian to build MPlayer [ar]
|
||||
--ranlib=RANLIB ranlib to build MPlayer [ranlib]
|
||||
--windres=WINDRES windres to build MPlayer [windres]
|
||||
--target=PLATFORM target platform (i386-linux, arm-linux, etc)
|
||||
--enable-static build a statically linked binary
|
||||
@ -486,8 +488,10 @@ _iwmmxt=auto
|
||||
_mtrr=auto
|
||||
_altivec=auto
|
||||
_install=install
|
||||
_ranlib=ranlib
|
||||
_windres=windres
|
||||
_cc=cc
|
||||
_ar=ar
|
||||
test "$CC" && _cc="$CC"
|
||||
_as=auto
|
||||
_runtime_cpudetection=no
|
||||
@ -787,6 +791,12 @@ for ac_option do
|
||||
--as=*)
|
||||
_as=`echo $ac_option | cut -d '=' -f 2`
|
||||
;;
|
||||
--ar=*)
|
||||
_ar=`echo $ac_option | cut -d '=' -f 2`
|
||||
;;
|
||||
--ranlib=*)
|
||||
_ranlib=`echo $ac_option | cut -d '=' -f 2`
|
||||
;;
|
||||
--windres=*)
|
||||
_windres=`echo $ac_option | cut -d '=' -f 2`
|
||||
;;
|
||||
@ -1375,6 +1385,12 @@ if aix ; then
|
||||
_ld_extra="$_ld_extra -lC"
|
||||
fi
|
||||
|
||||
if irix ; then
|
||||
_ranlib='ar -r'
|
||||
elif linux ; then
|
||||
_ranlib='true'
|
||||
fi
|
||||
|
||||
if win32 ; then
|
||||
_exesuf=".exe"
|
||||
# -lwinmm is always needed for osdep/timer-win2.c
|
||||
@ -7753,11 +7769,13 @@ DATADIR = \$(DESTDIR)$_datadir
|
||||
MANDIR = \$(DESTDIR)$_mandir
|
||||
CONFDIR = \$(DESTDIR)$_confdir
|
||||
|
||||
AR = $_ar
|
||||
CC = $_cc
|
||||
CXX = $_cc
|
||||
HOST_CC = $_host_cc
|
||||
INSTALL = $_install
|
||||
INSTALLSTRIP = $_install_strip
|
||||
RANLIB = $_ranlib
|
||||
WINDRES = $_windres
|
||||
|
||||
EXTRA_INC = $_inc_extra
|
||||
|
Loading…
Reference in New Issue
Block a user