Mercurial > mplayer.hg
changeset 2811:9b6aea4867fd
mplayer does not need -ldivxencore
mencoder does
| author | pl |
|---|---|
| date | Sun, 11 Nov 2001 01:45:01 +0000 |
| parents | 1f0bcdb49910 |
| children | 2c3ab498ac90 |
| files | Makefile configure |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Nov 11 01:44:54 2001 +0000 +++ b/Makefile Sun Nov 11 01:45:01 2001 +0000 @@ -129,7 +129,7 @@ $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o $(PRG_MENCODER): $(MENCODER_DEP) - $(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm + $(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(ENCORE_LIBS) $(TERMCAP_LIB) -lm # $(PRG_HQ): depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a # $(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread
--- a/configure Sun Nov 11 01:44:54 2001 +0000 +++ b/configure Sun Nov 11 01:45:01 2001 +0000 @@ -2467,7 +2467,8 @@ if test "$_divx4linux" = yes ; then _divx4def='#define NEW_DECORE' - _decorelibs='-ldivxdecore -ldivxencore opendivx/postprocess.o' + _decorelibs='-ldivxdecore opendivx/postprocess.o' + _encorelibs='-ldivxencore' else _divx4def='#undef NEW_DECORE' _decorelibs='-Lopendivx -ldecore' @@ -2523,6 +2524,7 @@ ARCH_LIBS = $_archlibs $_iconvlib STREAMING=$_streaming DECORE_LIBS = $_decorelibs +ENCORE_LIBS = $_encorelibs DIVX4LINUX=$_divx4linux MLIB_INC = $_mlibinc MLIB_LIB = $_mliblib