1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Commit Graph

521 Commits

Author SHA1 Message Date
diego
f9c89b761f Also remove generated tools on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23719 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-04 18:53:39 +00:00
diego
0b89e7d75e Compile internal FFmpeg libraries only when configure enabled the static
version of the libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23299 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-11 23:15:11 +00:00
reimar
1640f55dec mplayer.rc depends on version.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23238 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-05 20:40:37 +00:00
diego
1e7e180106 Reuse common Makefile infrastructure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23200 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-01 19:16:35 +00:00
diego
81a86e4f1e cosmetics: Move depend target (preparation for upcoming change).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23199 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-01 19:15:29 +00:00
diego
167bafa26f cosmetics: Rename Makefile variable CONFIG_ASS --> ASS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:38:04 +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
5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +00:00
diego
8f9626479d cosmetics: Sort PARTS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23091 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 21:48:20 +00:00
diego
0a6bfeaace Remove duplicate entries from PARTS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23089 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:57:38 +00:00
diego
b2fcb6f5b1 Remove redundant setting of variables when compiling FFmpeg libraries,
it's already being taken care of by configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-12 19:40:18 +00:00
diego
1dfa149ac5 Revert previous broken removal of partial dependency list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22980 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-12 14:42:48 +00:00
diego
c6803b94cc Remove the .norecurse hack. It bloats the Makefile, adds maintenance burden,
likely has no users and most of all does not work correctly anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22967 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-11 07:16:04 +00:00
diego
2276bef69c 10l typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22953 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-09 15:08:29 +00:00
diego
bf3fff69ca Move TOOLS/cpuinfo.c into the root directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22950 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-09 11:30:26 +00:00
ben
51ba40dcd6 merged libdha and libvidix, moved all files from libdha to vidix directory
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22918 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-06 15:20:49 +00:00
ben
257a77dc3d switch to new internal vidix API, no more dlopen/dlsym, libvidix is now a fully static library with all drivers built-in
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22875 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 11:06:06 +00:00
diego
b6d1ff3eec Merge all VIDIX drivers into libvidix.a.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22867 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 23:48:48 +00:00
diego
7bbb6e7043 Move the generation of OBJS_* from SRCS_* up before the addition of OBJS_*-yes
to OBJS_*.  The content of OBJS_*-yes was getting clobbered.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22862 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 18:12:16 +00:00
diego
d898f5c990 Build libdha statically like all the other libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22855 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 13:37:29 +00:00
rathann
259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-29 17:16:11 +00:00
diego
1cab6eae95 Linking hotfix, libavutil needs to come after libavcodec/libavformat.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22816 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 20:29:43 +00:00
diego
937a267a2b cosmetics: Reorder parts of the Makefile in order to group parts sensibly together.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22814 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 19:59:36 +00:00
diego
0b3c94b3fb Unconditionally add all subdirectories to PARTS. This way make clean always
descends into all subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22813 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 19:56:00 +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
82d3b9466e Move the addition of osdep/mplayer-rc.o to a place where it actually gets added to OBJS_MPLAYER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22808 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 16:27:25 +00:00
diego
f4f37679b5 Remove multistage recursion for the vidix subdirectory and recurse from the
top-level Makefile only.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22807 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-24 16:06:22 +00:00
diego
6c4d007414 Move -I. to the front of CFLAGS, works around problems with headers from
other projects having the same names as MPlayer ones.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22742 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-19 00:10:38 +00:00
diego
f439934b28 Remove commented-out -Wall CFLAGS, can be set from configure/config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22741 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-19 00:07:34 +00:00
diego
1c47e97b9c cosmetics: Move some parts around to make more sense overall.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22559 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 23:42:38 +00:00
diego
6fb78bac11 cosmetics: Move depend target in preparation for upcoming changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22557 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 22:43:11 +00:00
diego
4220b41edb Rename mp3lib/libMP3.a to mp3lib/libmp3.a for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22554 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 22:19:18 +00:00
diego
12d6e5b2c0 Add common sources to .depend target.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22543 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 00:37:29 +00:00
diego
1e4055ebdd Handle common parts at the objects instead of at the sources level.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22542 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 00:34:56 +00:00
diego
f07e14645d codecs.conf.h needs to be made before .depend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22541 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 23:53:40 +00:00
diego
74c95fdffb dirclean target was removed, don't mark as phony.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22539 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 23:24:42 +00:00
diego
af236fbe0f Remove -DCODECS2HTML from .depend creation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22534 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 18:33:50 +00:00
diego
af4cbb98a0 Add codec-cfg-test target.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22517 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 17:44:10 +00:00
diego
7454f57944 mplayer.c and mencoder.c are already in SRCS_MPLAYER and SRCS_MENCODER
respectively, no need to add them separately for .depend generation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22513 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 16:26:13 +00:00
diego
8473473515 'make clean' should remove generated binaries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22511 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 16:16:21 +00:00
diego
d3a6ef50c3 Merge clean and dirclean targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22510 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 16:07:36 +00:00
diego
6f1e593089 Simplify strip parameter for install handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22364 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 17:10:11 +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
ac8d43dbed some more consistency for the VIDIX installation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22329 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 22:14:15 +00:00
uau
d5d4c6c7e2 Split command/property handling from mplayer.c to a new file command.c.
Move some global and static variables under a struct that can be given
as a parameter. Add a context argument to the property functions so that
they do not have to depend on global/static variables.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22298 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 00:49:24 +00:00
reimar
4b774aacd1 Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:04:46 +00:00
diego
d82ed3ea08 URL fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22073 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:02:37 +00:00
diego
0ef2659ddc cosmetics: Reorder install targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22072 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:02:19 +00:00
diego
c98258efb8 Mark phony targets as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22071 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:01:10 +00:00
diego
37f9005da1 Replace ifeq structure in the install target by a set of dependent targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22070 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 11:00:54 +00:00