Mercurial > mplayer.hg
diff Makefile @ 32459:1a605463f62b
Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
author | cigaes |
---|---|
date | Wed, 27 Oct 2010 16:58:23 +0000 |
parents | ab8fb38f28b1 |
children | d80bbc5868de |
line wrap: on
line diff
--- a/Makefile Wed Oct 27 16:48:21 2010 +0000 +++ b/Makefile Wed Oct 27 16:58:23 2010 +0000 @@ -278,7 +278,7 @@ SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c -SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c +SRCS_COMMON-$(UNRAR_EXEC) += sub/unrar_exec.c SRCS_COMMON-$(VCD) += stream/stream_vcd.c SRCS_COMMON-$(VORBIS) += libmpcodecs/ad_libvorbis.c \ libmpdemux/demux_ogg.c @@ -347,7 +347,6 @@ playtree.c \ playtreeparser.c \ subopt-helper.c \ - vobsub.c \ libaf/af.c \ libaf/af_center.c \ libaf/af_channels.c \ @@ -522,6 +521,7 @@ sub/spudec.c \ sub/sub_cc.c \ sub/subreader.c \ + sub/vobsub.c \ $(SRCS_COMMON-yes) @@ -1059,8 +1059,9 @@ TOOLS/bmovl-test$(EXESUF): -lSDL_image -TOOLS/subrip$(EXESUF): vobsub.o sub/spudec.o unrar_exec.o libvo/aclib.o \ - ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(TEST_OBJS) +TOOLS/subrip$(EXESUF): sub/vobsub.o sub/spudec.o sub/unrar_exec.o \ + libvo/aclib.o ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a \ + $(TEST_OBJS) TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32