Mercurial > mplayer.hg
changeset 6036:5d543521dd06
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
| author | pl |
|---|---|
| date | Fri, 10 May 2002 01:50:17 +0000 |
| parents | 2f1dc330d566 |
| children | aa530a1dd29b |
| files | Gui/Makefile Gui/bitmap/Makefile configure |
| diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/Makefile Fri May 10 01:23:15 2002 +0000 +++ b/Gui/Makefile Fri May 10 01:50:17 2002 +0000 @@ -28,7 +28,7 @@ $(LIB): .depend $(OBJS) $(MAKE) -C mplayer rm -f $(LIB) - ar rc $(LIB) $(OBJS) $(MPLAYEROBJS) + $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS) all: $(LIB)
--- a/Gui/bitmap/Makefile Fri May 10 01:23:15 2002 +0000 +++ b/Gui/bitmap/Makefile Fri May 10 01:50:17 2002 +0000 @@ -16,7 +16,7 @@ make -C jpeg/jpeg-6b libjpeg.a ) # ( make -C jpeg/jpeg-6b libjpeg.a && mv jpeg/jpeg-6b/libjpeg.a "$(JPEGLIB)" ) ) $(MAKE) $(OBJS) - ar rc libbitmap.a $(OBJS) jpeg/jpeg-6b/*.o + $(AR) rc libbitmap.a $(OBJS) jpeg/jpeg-6b/*.o ranlib libbitmap.a mv libbitmap.a ../libs
--- a/configure Fri May 10 01:23:15 2002 +0000 +++ b/configure Fri May 10 01:50:17 2002 +0000 @@ -184,7 +184,7 @@ --disable-alsa disable alsa sound support [autodetect] --disable-sunaudio disable Sun sound 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: --cc=COMPILER use this C compiler to build MPlayer [gcc] @@ -3526,8 +3526,10 @@ _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" bsdos && _ld_arch="$_ld_arch -ldvd" -netbsd && _ld_arch="$_ld_arch -li386 -lossaudio" -openbsd && _ld_arch="$_ld_arch -li386 -lossaudio" +if netbsd || openbsd ; then + _ld_arch="$_ld_arch -lossaudio" + x86 && _ld_arch="$_ld_arch -li386" +fi _def_debug='#undef MP_DEBUG' test "$_debug" && _def_debug='#define MP_DEBUG 1' @@ -3598,7 +3600,7 @@ DATADIR = $_datadir CONFDIR = $_confdir LIBDIR = $_libdir -AR = ar +#AR = ar CC = $_cc AWK = $_awk # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math