RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 23:32:26 +00:00
Code Issues Releases Wiki Activity

fix -lasound -lesd.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1034 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-06-05 10:59:38 +00:00
parent 9bfe5d6141
commit c09a122c4c
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@ BINDIR = ${prefix}/bin
SRCS = find_sub.c aviprint.c dll_init.c dec_audio.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c
OBJS = $(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) # -Wall
A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3
A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
VO_LIBS = -Llibvo -lvo $(X_LIBS)
.SUFFIXES: .c .o

28
configure vendored
View File

@ -1047,6 +1047,20 @@ if [ $_png = yes ]; then
_libpng='-lpng -lz'
fi
_alsa5='#undef HAVE_ALSA5'
_alsa9='#undef HAVE_ALSA9'
if [ $_alsa == 'yes' ]; then
[ $_alsaver == '0.5.x' ] && { _aosrc="$_aosrc ao_alsa5.c"; _alsa5='#define HAVE_ALSA5'; _alsalib='-lasound'; }
# [ $_alsaver == '0.9.x' ] && { _aosrc="$_aosrc ao_alsa9.c"; _alsa9='#define HAVE_ALSA9'; _alsalib='-lasound'; }
fi
_esdd='#undef HAVE_ESD'
#if [ $_esd == 'yes' ]; then
# _esdd='#define HAVE_ESD'
# _aosrc="$ao_src ao_esd.c"
# _esdlib='-lesd'
#fi
# Checking for CFLAGS
if [ "$_profile" != "" ] || [ "$_debug" != "" ]; then
CFLAGS="-O2 -march=$proc -mcpu=$proc $_debug $_profile"
@ -1076,6 +1090,8 @@ CSS_INC = $_cssinc
WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
DS_DEP = $_dshowdep
DS_LIB = $_dshowlib
ALSA_LIB = $_alsalib
ESD_LIB = $_esdlib
prefix = $_prefix
ARCH_LIBS = -ldl -lpthread
@ -1237,18 +1253,6 @@ else
_gui='#undef HAVE_GUI'
fi
_alsa5='#undef HAVE_ALSA5'
_alsa9='#undef HAVE_ALSA9'
if [ $_alsa == 'yes' ]; then
[ $_alsaver == '0.5.x' ] && { _aosrc="$_aosrc ao_alsa5.c"; _alsa5='#define HAVE_ALSA5'; }
# [ $_alsaver == '0.9.x' ] && { _aosrc="$_aosrc ao_alsa9.c"; _alsa9='#define HAVE_ALSA9'; }
fi
_esdd='#undef HAVE_ESD'
if [ $_esd == 'yes' ]; then
_esdd='#undef HAVE_ESD'
# _aosrc="$ao_src ao_esd.c"
fi
cat > $CCONF << EOF