RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-06 15:11:58 +00:00
Code Issues Releases Wiki Activity

corrected what felix made buggy ;-)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5842 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
jaf 2002-04-26 19:11:13 +00:00
parent e602a125f0
commit a9c22ff423
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -91,7 +91,7 @@ all: $(ALL_PRG)
.c.o: .c.o:
$(CC) -c $(CFLAGS) -o $@ $< $(CC) -c $(CFLAGS) -o $@ $<
COMMON_DEPS = $(FAME_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
ifeq ($(VIDIX),yes) ifeq ($(VIDIX),yes)
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
@ -101,6 +101,9 @@ COMMON_DEPS += libvo2/libvo2.a
else else
COMMON_DEPS += libvo/libvo.a COMMON_DEPS += libvo/libvo.a
endif endif
ifeq ($(FAME),yes)
COMMON_DEPS += libfame/libfame.a
endif
ifeq ($(DVDKIT),yes) ifeq ($(DVDKIT),yes)
ifeq ($(DVDKIT_SHARED),yes) ifeq ($(DVDKIT_SHARED),yes)
COMMON_DEPS += libmpdvdkit/libmpdvdkit.so COMMON_DEPS += libmpdvdkit/libmpdvdkit.so
@ -211,6 +214,9 @@ $(MENCODER_DEP): version.h
$(PRG_CFG): version.h codec-cfg.c codec-cfg.h $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
jaf:
echo $(COMMON_DEPS)
install: $(ALL_PRG) install: $(ALL_PRG)
ifeq ($(VIDIX),yes) ifeq ($(VIDIX),yes)
$(DO_MAKE) $(DO_MAKE)

2
configure vendored
View File

@ -3046,7 +3046,6 @@ _def_fame='#undef USE_LIBFAME'
if test "$_fame" = yes ; then if test "$_fame" = yes ; then
_def_fame='#define USE_LIBFAME 1' _def_fame='#define USE_LIBFAME 1'
_ld_fame='-Llibfame -lfame' _ld_fame='-Llibfame -lfame'
_dep_fame='libfame/libfame.a'
fi fi
echocheck "libdv-0.9.5 (for mencoder)" echocheck "libdv-0.9.5 (for mencoder)"
@ -3611,7 +3610,6 @@ AV_DEP = $_dep_libavcodec
AV_LIB = $_ld_libavcodec AV_LIB = $_ld_libavcodec
FAME = $_fame FAME = $_fame
FAME_LIB = $_ld_fame FAME_LIB = $_ld_fame
FAME_DEB = $_dep_fame
MP1E_DEP = $_dep_mp1e MP1E_DEP = $_dep_mp1e
MP1E_LIB = $_ld_mp1e MP1E_LIB = $_ld_mp1e
ARCH_LIB = $_ld_arch $_ld_iconv ARCH_LIB = $_ld_arch $_ld_iconv