diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-23 10:07:50 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-23 10:07:50 +0000 |
| commit | 4e2837a2e8d66808a84a4db25d7e26d312490022 (patch) | |
| tree | 4f0b83dd0567b07122ad3cc524d81295dc529b81 /libvo | |
| parent | 97851078146177f500266a174b7f559482a0525e (diff) | |
| download | mpv-4e2837a2e8d66808a84a4db25d7e26d312490022.tar.bz2 mpv-4e2837a2e8d66808a84a4db25d7e26d312490022.tar.xz | |
Merge libvo/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/Makefile | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libvo/Makefile b/libvo/Makefile deleted file mode 100644 index f2840e9161..0000000000 --- a/libvo/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libosd.a -LIBNAME_MPLAYER = libvo.a - -SRCS_MPLAYER = aspect.c \ - geometry.c \ - spuenc.c \ - video_out.c \ - vo_mpegpes.c \ - vo_null.c \ - vo_yuv4mpeg.c \ - $(VO_SRCS) \ - -SRCS_MPLAYER-$(VIDIX) += vosub_vidix.c - -SRCS_COMMON = aclib.c \ - osd.c \ - sub.c \ - -SRCS_COMMON-$(BITMAP_FONT) += font_load.c -SRCS_COMMON-$(FREETYPE) += font_load_ft.c - -include ../mpcommon.mak - -%.o: %.m - $(CC) $(CFLAGS) -c -o $@ $< |