Mercurial > mplayer.hg

changeset 2703:4e321443413f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Quick hack to don't use ldivxencode on systems where it'S not installed. This should be improved: add compile check to configure (with sth. from encore2.h I guess), seperate divxdecore and encore as only one of them could possibly be installed, add ifdefs to code so it doesn't spit errors about missing headers if no divx4 is present. (I don't currently have installed divx4 so I only did the quick hack for first).
author atmos4
date Mon, 05 Nov 2001 02:04:10 +0000
parents 440312d953a8
children b4c6699d3893
files Makefile configure
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Nov 05 01:21:05 2001 +0000
+++ b/Makefile	Mon Nov 05 02:04:10 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) -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame -ldivxencore -Llibmpeg2 -lmpeg2 $(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) -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame -Llibmpeg2 -lmpeg2 $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_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	Mon Nov 05 01:21:05 2001 +0000
+++ b/configure	Mon Nov 05 02:04:10 2001 +0000
@@ -2443,7 +2443,7 @@
 
 if test "$_divx4linux" = yes ; then
  _divx4def='#define NEW_DECORE'
- _decorelibs='-ldivxdecore opendivx/postprocess.o'
+ _decorelibs='-ldivxdecore -ldivxencore opendivx/postprocess.o'
 else
  _divx4def='#undef NEW_DECORE'
  _decorelibs='-Lopendivx -ldecore'