diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-05 02:04:10 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-05 02:04:10 +0000 |
| commit | 30ffaf0e5f14f9ed4f27374d2ef62953b9254cd3 (patch) | |
| tree | cfeb5dc466c309b375e2a471533f55dcd9a775d0 | |
| parent | d7db781cf85c28c0667eedebca8f82403830909e (diff) | |
| download | mpv-30ffaf0e5f14f9ed4f27374d2ef62953b9254cd3.tar.bz2 mpv-30ffaf0e5f14f9ed4f27374d2ef62953b9254cd3.tar.xz | |
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).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2704 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) -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 @@ -2443,7 +2443,7 @@ fi 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' |