diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
| commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
| tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /Makefile | |
| parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz | |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 21 insertions, 7 deletions
@@ -1,8 +1,23 @@ -# LINUX Makefile made by A'rpi / Astral -# Some cleanup by LGB: * 'make -C dir' instead of 'cd dir;make;cd..' -# * for loops instead of linear sequence of make directories -# * some minor problems with make clean and distclean were corrected -# * DVD support +# MPlayer Makefile +# +# copyright (c) 2008 Diego Biurrun +# Rewritten entirely from a set of Makefiles written by Arpi and many others. +# +# This file is part of MPlayer. +# +# MPlayer is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# MPlayer is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with MPlayer; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include config.mak @@ -509,7 +524,6 @@ SRCS_MPLAYER = mplayer.c \ libvo/video_out.c \ libvo/vo_mpegpes.c \ libvo/vo_null.c \ - libvo/vo_yuv4mpeg.c \ $(addprefix libvo/,$(VO_SRCS)) \ SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c @@ -566,7 +580,7 @@ SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c SRCS_MPLAYER-$(LIRC) += input/lirc.c SRCS_MPLAYER-$(VIDIX) += libvo/vosub_vidix.c \ - vidix/vidixlib.c \ + vidix/vidix.c \ vidix/drivers.c \ vidix/dha.c \ vidix/mtrr.c \ |