From 20cce1151e62d5ffd1bc15b4a8756f329c0e06ef Mon Sep 17 00:00:00 2001 From: pl Date: Fri, 10 May 2002 01:50:17 +0000 Subject: [PATCH] =?UTF-8?q?patchs=20by=20Bj=C3=B6rn=20Sandell=20:=20=20-=20--disable-select=20affects=20more=20tha?= =?UTF-8?q?n=20the=20oss=20audio=20=20-=20openbsd=20and=20netbsd=20oss=20s?= =?UTF-8?q?upport=20for=20non-x86=20=20-=20ar/AR=20cleanups=20as=20'$(AR)'?= =?UTF-8?q?=20defaults=20to=20'ar'=20with=20make?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6037 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/Makefile | 2 +- Gui/bitmap/Makefile | 2 +- configure | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Gui/Makefile b/Gui/Makefile index ff0311b74c..d15eb9e0b9 100644 --- a/Gui/Makefile +++ b/Gui/Makefile @@ -28,7 +28,7 @@ CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) $(LIB): .depend $(OBJS) $(MAKE) -C mplayer rm -f $(LIB) - ar rc $(LIB) $(OBJS) $(MPLAYEROBJS) + $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS) all: $(LIB) diff --git a/Gui/bitmap/Makefile b/Gui/bitmap/Makefile index da6bf55618..a2fa5a7b93 100644 --- a/Gui/bitmap/Makefile +++ b/Gui/bitmap/Makefile @@ -16,7 +16,7 @@ all: 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 diff --git a/configure b/configure index 1da7cab99b..873280bea3 100755 --- a/configure +++ b/configure @@ -184,7 +184,7 @@ Audio: --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 @@ test "$_xanim" = yes && _ld_dl_dynamic='-rdynamic' _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 @@ prefix = $_prefix 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