RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

patchs by Björn Sandell <biorn@dce.chalmers.se>: 

- --disable-select affects more than the oss audio
 - openbsd and netbsd oss support for non-x86
 - ar/AR cleanups as '$(AR)' defaults to 'ar' with make


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6037 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2002-05-10 01:50:17 +00:00
parent d0afb257b9
commit 20cce1151e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/Makefile
View File

@ -28,7 +28,7 @@ CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG)
$(LIB): .depend $(OBJS) $(LIB): .depend $(OBJS)
$(MAKE) -C mplayer $(MAKE) -C mplayer
rm -f $(LIB) rm -f $(LIB)
ar rc $(LIB) $(OBJS) $(MPLAYEROBJS) $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS)
all: $(LIB) all: $(LIB)

2
Gui/bitmap/Makefile
View File

@ -16,7 +16,7 @@ all:
make -C jpeg/jpeg-6b libjpeg.a ) make -C jpeg/jpeg-6b libjpeg.a )
# ( make -C jpeg/jpeg-6b libjpeg.a && mv jpeg/jpeg-6b/libjpeg.a "$(JPEGLIB)" ) ) # ( make -C jpeg/jpeg-6b libjpeg.a && mv jpeg/jpeg-6b/libjpeg.a "$(JPEGLIB)" ) )
$(MAKE) $(OBJS) $(MAKE) $(OBJS)
ar rc libbitmap.a $(OBJS) jpeg/jpeg-6b/*.o $(AR) rc libbitmap.a $(OBJS) jpeg/jpeg-6b/*.o
ranlib libbitmap.a ranlib libbitmap.a
mv libbitmap.a ../libs mv libbitmap.a ../libs

10
configure vendored
View File

@ -184,7 +184,7 @@ Audio:
--disable-alsa disable alsa sound support [autodetect] --disable-alsa disable alsa sound support [autodetect]
--disable-sunaudio disable Sun sound support [autodetect] --disable-sunaudio disable Sun sound support [autodetect]
--disable-mad disable mad audio support [autodetect] --disable-mad disable mad audio support [autodetect]
--disable-select disable using select() on OSS audio device [enable] --disable-select disable using select() on audio device [enable]
Miscellaneous options: Miscellaneous options:
--cc=COMPILER use this C compiler to build MPlayer [gcc] --cc=COMPILER use this C compiler to build MPlayer [gcc]
@ -3526,8 +3526,10 @@ test "$_xanim" = yes && _ld_dl_dynamic='-rdynamic'
_ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
bsdos && _ld_arch="$_ld_arch -ldvd" bsdos && _ld_arch="$_ld_arch -ldvd"
netbsd && _ld_arch="$_ld_arch -li386 -lossaudio" if netbsd || openbsd ; then
openbsd && _ld_arch="$_ld_arch -li386 -lossaudio" _ld_arch="$_ld_arch -lossaudio"
x86 && _ld_arch="$_ld_arch -li386"
fi
_def_debug='#undef MP_DEBUG' _def_debug='#undef MP_DEBUG'
test "$_debug" && _def_debug='#define MP_DEBUG 1' test "$_debug" && _def_debug='#define MP_DEBUG 1'
@ -3598,7 +3600,7 @@ prefix = $_prefix
DATADIR = $_datadir DATADIR = $_datadir
CONFDIR = $_confdir CONFDIR = $_confdir
LIBDIR = $_libdir LIBDIR = $_libdir
AR = ar #AR = ar
CC = $_cc CC = $_cc
AWK = $_awk AWK = $_awk
# OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math