RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-15 11:25:10 +00:00
Code Issues Releases Wiki Activity
26,529 Commits 41 Branches 86 Tags 132 MiB
f2d8773fca
Commit Graph

42 Commits

Author SHA1 Message Date
diego
ae09115f2b Merge mp3lib/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-27 22:53:18 +00:00
diego
e362640899 Add rule for generating dependency files from Objective C files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26541 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-26 09:16:15 +00:00
diego
e7f6edf300 dependency generation infrastructure for C++ files 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-24 21:46:50 +00:00
diego
9551fc7e63 Expand conditional addition of elements to variables with a form that permits 
using two conditions. This allows getting rid of some ifeqs in Makefiles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-24 15:32:44 +00:00
diego
4e2837a2e8 Merge libvo/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-23 10:07:50 +00:00
diego
9818a95c58 per-file dependencies (for the non-recursive parts) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26464 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-18 22:49:17 +00:00
diego
a725babf25 Always generate dependency information. This also allows dropping the 
hackish list of incorrect pseudo-dependencies.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26462 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-18 21:46:52 +00:00
diego
8dd605f5e4 Declare all clean targets phony in mpcommon.mak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26444 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-13 21:23:27 +00:00
diego
4022a072f0 Fix FFmpeg DEPEND_CMD to account for latest changes and add MPDEPEND_CMD. 
MPlayer needs a slightly modified incantation due to different levels
of Makefile indirection.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26348 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-07 23:49:39 +00:00
diego
8109559bf8 Use DEPEND_CMD as set by configure to generate dependency information instead 
of hardcoding a gcc-specific command. This also fixes dependency generation
for files in subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-06 21:56:11 +00:00
diego
6be4482804 Use the more natural ">" instead of "1>" for stdout redirection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26332 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-05 16:19:10 +00:00
diego
f653e52663 Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS. 
Thus there is no need to use it everywhere.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-03 19:37:41 +00:00
diego
4ba4e17b71 Remove unnecessary addition of -Ilibavformat to CFLAGS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26151 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-03 19:31:38 +00:00
diego
4ec85e8560 Add checkheaders target, ported from FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26145 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-03 09:59:11 +00:00
diego
4e1f13e464 Revert include flag reordering, it does not fix the compilation problem. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23801 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-17 10:55:36 +00:00
diego
ef4a583b72 Reorder CFLAGS, fixes compilation after addition of png.h to FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23793 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-16 20:13:25 +00:00
diego
5a8c8aadef cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-25 08:35:35 +00:00
diego
332482d61b Append objects derived from sources to OBJS_*. This way the OBJS_* variables 
do not get clobbered if they were set before.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22866 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-31 23:33:30 +00:00
cehoyos
e38e4637f6 Revert r22819 
Fix to compile libvo/vo_xvmc.c is no longer needed after FFmpeg r8527.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22832 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-26 22:03:43 +00:00
cehoyos
551aeefee1 Fix compilation of libvo/vo_xvmc.c 
Patch by Erik Auerswald, auerswal A unix-ag D uni-kl D de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22819 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-25 14:50:02 +00:00
diego
48cea610fb Move the addition of basic include flags to configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22812 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-24 19:44:15 +00:00
diego
91fd156f91 libavutil/ is not optional, compile it unconditionally. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22811 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-24 19:40:32 +00:00
diego
83470e26c3 Move test program removal on distclean to mpcommon.mak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22802 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-24 15:03:57 +00:00
diego
298ea20c97 Move -I. and -I.. to the front of CFLAGS so that headers in the root directory 
take precedence over ones in the subdirectories.
This works around the problem of confusing the two copies of xvmc_render.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22736 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-18 23:18:09 +00:00
diego
5f6965df5d Move libav* include CFLAGS to mpcommon.mak instead of duplicating them. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22735 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-18 22:49:37 +00:00
diego
e72f48c19f Merge CFLAGS lines. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22732 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-18 22:11:32 +00:00
diego
a3a649adbc dep/depend should be a double colon target as well. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22560 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-13 23:55:10 +00:00
diego
60b39e2786 Give more descriptive names to the source and library variables and split 
between common, MPlayer-specific and MEncoder-specific parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-13 12:10:57 +00:00
diego
2f252694a0 Give the library generation target a more sensible name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22544 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-13 10:14:05 +00:00
diego
40f53feeec Mark phony targets as such. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22540 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-12 23:26:02 +00:00
diego
50aaf4a1d4 Simplify .depend file inclusion. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22335 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-24 10:44:16 +00:00
diego
3f3f9eaae5 100l: Copy and paste typo, library dependencies and rules are separated now. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22133 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-04 19:18:26 +00:00
diego
8266955613 Merge both library rules by separating the rule from the dependencies. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22111 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-03 14:02:09 +00:00
diego
f72beec4da Consider SRCS2 as well when generating dependency information. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22100 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-01 01:09:39 +00:00
diego
c00059b047 Remove suffix rules that are just copies of make builtin rules. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-02 12:08:25 +00:00
diego
b125a9e129 Add libav include paths to CFLAGS without indirection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-01 01:11:42 +00:00
diego
513971a1b0 Generate OBJS from SRCS in a more elegant and less redundant way. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21354 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-28 11:54:12 +00:00
diego
f415c639b9 Move common code to mpcommon.mak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-27 13:32:24 +00:00
nplourde
b8f08fe3b0 oops someone forgot obj-c source file 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21319 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-27 12:07:14 +00:00
diego
90c0639a72 .s files don't exist anymore. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21308 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-27 10:44:43 +00:00
diego
e6b3cc9b3d Move common code for generating multiple libraries to mpcommon.mak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21303 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-27 01:40:39 +00:00
diego
dc2be42703 Merge common parts of all Makefiles into one file included by all. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-26 18:12:36 +00:00