mirror of https://github.com/mpv-player/mpv
mplayer does not need -ldivxencore
mencoder does git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2812 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
a0cfaaf615
commit
c00ac3a4ec
2
Makefile
2
Makefile
|
@ -129,7 +129,7 @@ $(PRG_FIBMAP): fibmap_mplayer.o
|
|||
$(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
|
||||
|
|
|
@ -2467,7 +2467,8 @@ fi
|
|||
|
||||
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 @@ SGI_AUDIO_LIB = $_sgi_audio_lib
|
|||
ARCH_LIBS = $_archlibs $_iconvlib
|
||||
STREAMING=$_streaming
|
||||
DECORE_LIBS = $_decorelibs
|
||||
ENCORE_LIBS = $_encorelibs
|
||||
DIVX4LINUX=$_divx4linux
|
||||
MLIB_INC = $_mlibinc
|
||||
MLIB_LIB = $_mliblib
|
||||
|
|
Loading…
Reference in New Issue