diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-13 17:44:14 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-13 17:44:14 +0000 |
commit | b48576a528cb746bc9d77769e667684edc069899 (patch) | |
tree | 1cd44a0daf3cfe1e2a2635e6bbcd094613218845 | |
parent | dac494eff8b924afabdc2ffbd93b1ab2ac1b8a4f (diff) | |
download | mpv-b48576a528cb746bc9d77769e667684edc069899.tar.bz2 mpv-b48576a528cb746bc9d77769e667684edc069899.tar.xz |
comp.fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5602 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 6 | ||||
-rwxr-xr-x | configure | 4 |
2 files changed, 3 insertions, 7 deletions
@@ -37,17 +37,13 @@ MANDIR = ${prefix}/man # a BSD compatible 'install' program INSTALL = install -SRCS_COMMON = cyuv.c xacodec.c cpudetect.c mp_msg.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c vobsub.c +SRCS_COMMON = cyuv.c xacodec.c cpudetect.c mp_msg.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c roqav.c qtrpza.c vobsub.c SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c mp-opt-reg.c OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) -ifeq ($(PNG),yes) -SRCS_COMMON += mpng.c -endif - ifeq ($(VO2),yes) VO_LIBS = -Llibvo2 -lvo2 VO_INC = -Ilibvo2 @@ -2918,11 +2918,11 @@ elif test "$_divx4linux" != no && cc_check -lm -ldivxdecore -lm ; then _xvid=no _divx4linux=yes _opendivx=no - _ld_decore='-ldivxdecore opendivx/postprocess.o' + _ld_decore='-ldivxdecore' _def_decore='#define NEW_DECORE 1' _def_divx='#define USE_DIVX' _def_divx5='#undef DECORE_DIVX5' - _def_odivx_postprocess='#define HAVE_ODIVX_POSTPROCESS 1' + _def_odivx_postprocess='#undef HAVE_ODIVX_POSTPROCESS' _codecmodules="divx4linux $_codecmodules" _nocodecmodules="xvid $_nocodecmodules" echores "DivX4linux (with libdivxdecore.so)" |