1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 15:52:25 +00:00
Commit Graph

640 Commits

Author SHA1 Message Date
diego
34db110473 cosmetics: Align columns.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26362 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 12:54:07 +00:00
diego
32824f5eca Merge libass/Makefile into Makefile, one less recursive make directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26356 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:25:59 +00:00
diego
36d1b39c9e cosmetics: Rename some shell variables to give them more descriptive names.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26355 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:11:17 +00:00
diego
c4a51ba068 cosmetics: Merge shell commands into one line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26354 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:08:23 +00:00
diego
fa4f36202e Do not suppress command output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26353 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:07:03 +00:00
diego
ff191b8495 Merge osdep/Makefile into the top-level Makefile, thus getting rid
of recursive make in the osdep/ subdirectory.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 18:25:30 +00:00
diego
f827599b48 Build all parts in the libmenu subdirectory nonrecursively.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26343 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 08:28:54 +00:00
diego
c9b0ef9bca Get rid of recursive make for the input/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:09:06 +00:00
diego
730bff7914 100l: Revert previous accidental commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26337 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 21:52:50 +00:00
diego
f4d87d3e88 Rename RTJPEG files so that filenames consist of lowercase name only.
Parts of the build system assume lowercase-only filenames.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 18:17:59 +00:00
diego
84376fec0b Add multiple inclusion guards to help_mp.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26333 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 16:29:10 +00:00
diego
63f2517dd2 Remove now useless PARTS-yes line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26319 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 22:00:54 +00:00
reimar
f8fe49b504 Compile codec-cfg binary with -O, avoids problems due to compilers
not being well tested with optimizations disabled (e.g. ICC 10.1.008
generates a non-existing "rorw $8, %st(7)" instruction).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26090 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 13:04:29 +00:00
ben
b04ef6f779 allow generation of ctags and etags
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25661 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 18:40:26 +00:00
diego
f9455f34d0 Remove internal unrarlib copy, the new unrarexec code is a strict superset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:10:26 +00:00
ulion
df0f80508e Support using unrar executable to access rar-compressed vobsub files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25389 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 08:16:39 +00:00
uau
d33703496c Add audio filter scaletempo
Patch by Robert Juliano, juliano.1 osu edu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24924 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:38 +00:00
cehoyos
0174a38b37 Silence make's 'Please run configure again' if it was already run.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24288 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-29 10:12:24 +00:00
diego
84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
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
diego
3c991851c4 Do not create font subdir of data directory, bitmap font support is deprecated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22017 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 18:06:21 +00:00
diego
36a3d4ef74 Simplify install calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21977 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:57:57 +00:00
diego
e34daff688 Remove redundant informative output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21976 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:55:57 +00:00
diego
ba848192b8 Don't suppress make output during installation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21975 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:55:30 +00:00
diego
c87711f2f7 some simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21974 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:39:21 +00:00
diego
2266d94b08 Fix mplayer-rc.o build.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21528 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 13:55:39 +00:00
diego
cde348cd47 Move the generation of osdep/mplayer-rc.o back to the top-level Makefile,
having it as a part of osdep/libosdep.a is not enough.
based on a patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 11:59:23 +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
a986aade52 Unrecurse VIDIX installation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21352 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 10:04:41 +00:00
diego
b6adddcbbc Unrecurse VIDIX drivers uninstall.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21351 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 09:36:39 +00:00
diego
5dbf242b15 Remove one level of indirection on VIDIX install/uninstall.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21350 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 09:33:53 +00:00
diego
b78cffaa84 Shorten LIBAV_INC handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:57:42 +00:00
diego
02436df5fc Split muxers into a separate library that only MEncoder is linked against.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 14:26:52 +00:00
diego
3d9e9137d5 libmpdemux has no subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21300 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:01:50 +00:00
diego
08544e86ac Add explicit dependency information for libosd.a, this fixes MEncoder-only
build.  Noticed by Torinthiel.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21273 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 16:31:47 +00:00
diego
838f55e20b Linking hotfix, loader depends on osdep.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21241 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:24:58 +00:00
diego
e2d12a60b4 FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21225 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:49:29 +00:00
diego
27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
diego
bfce0b673d Move osdep/mplayer.rc handling to the osdep Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21205 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 09:49:18 +00:00
nplourde
ac04dcd625 added mmap_anon to osdep lib. Used in loader for now
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21203 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 01:22:20 +00:00
diego
58a9204e79 Make loader Makefile non-recursive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21201 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 00:31:07 +00:00
diego
db1997e695 LIBS vs LDFLAGS typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21147 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:58:39 +00:00
diego
37fd66bd41 Split libs that are dependencies and those that are just linker flags.
Fixes spurious rebuilds of MPlayer and MEncoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:42:20 +00:00
diego
84cbc3b50c Treat fontconfig and FreeType linker flags just like any other linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:20:32 +00:00
diego
d021529c71 cosmetics: EXTRA_LIB_MENCODER --> EXTRALIBS_MENCODER
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21140 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:23:35 +00:00
diego
95de8f239f Remove libdha from LIBS_MPLAYER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21134 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:40:53 +00:00
diego
cc9eb2aac3 Move FFmpeg library dependencies into the Makefile just like everything else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:49:46 +00:00
diego
43c4abaf0c Merge MPlayer-specific libs into one variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:12:19 +00:00
diego
6178e38e46 Split libvo.a into two libs so that libosd.a can be used by MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:49:47 +00:00
diego
3f6df7b998 Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21122 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:35:41 +00:00
diego
91a713bcc7 Add VIDIX to LIBS_MPLAYER directly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21119 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:21:09 +00:00
diego
2b1b586634 Add support for disabling MPlayer compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:14:01 +00:00
diego
aa883180fb Oops, the loader stuff needs to be in COMMON_LIBS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21106 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:49:08 +00:00
diego
71c7b6353e Deliver dependency handling from redundancy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21105 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:45:33 +00:00
diego
6ea42bcf02 Remove MPlayer-specific dependencies from COMMON_DEPS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21104 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:27:00 +00:00
diego
4086945ce6 VIDIX is for MPlayer only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21103 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:57:12 +00:00
diego
9314030e44 The GUI is only for MPlayer, not MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21102 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:39:36 +00:00
diego
71a08757e8 Rename variables for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21101 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:38:21 +00:00
diego
6437823387 Simplify gui and menu libs handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:34:47 +00:00
diego
e2da505741 cosmetics: Move some stuff around for better readability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21099 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:00:26 +00:00
diego
bbe643b5b1 Clean up PARTS handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21097 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:20:37 +00:00
diego
cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
diego
efdd1c240b Uninstall should run all parts unconditionally.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21095 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:14:11 +00:00
diego
519c0331bd Remove nonsense ifeq around MEncoder target and variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21094 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:13:40 +00:00
diego
f537fa351d Put libdvdcss under a separate ifeq.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21086 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:18:57 +00:00
diego
8cf4397274 Rename libdvdread to dvdread. We really only include only the dvdread
subdirectory of libdvdread.  This will also allow getting rid of some
local modifications.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 00:33:01 +00:00
diego
f06a2b11a0 The addition of loader/ to PARTS depended on a non-existing variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20835 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 16:39:13 +00:00
rathann
866ba3f296 Disable linking mplayer (and internal static libavcodec) with
libmp3lame/faac/x264 if --disable-encoder=mp3lame/faac/x264
options are passed to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20827 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 23:14:33 +00:00
diego
b31b19858f 10l: Overlooked one $(EXESUF) addition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20807 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 23:45:15 +00:00
diego
78a3bf6c9b Create binaries with proper executable suffix under Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20771 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 00:13:33 +00:00
diego
3829ecb1a2 Remove remnants of long-gone libfame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20739 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 22:57:14 +00:00
diego
0384045e30 Streamline and simplify internal vs external libdvdread handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20651 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 22:03:58 +00:00
kraymer
630302ad63 remove charset files (all of them are in UTF-8 now anyway)
change build system accordingly


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20650 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 21:52:35 +00:00
diego
376951ca72 libmpdvdkit2 --> libdvdread, it just contains libdvdread now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20631 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 13:48:52 +00:00
diego
689d0cc0f4 Move libdvdcss into its own subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20629 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 12:25:56 +00:00
diego
551d22810f Run dirclean instead of clean on distclean, this way we only need to
recurse through subdirectories once.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20558 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 13:34:17 +00:00
diego
dd3fa699eb Unification of linker option handling, part 1 of many.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20555 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 12:52:05 +00:00
diego
0e80da24d1 CFLAGS are not necessary for linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 12:41:29 +00:00
diego
9261f1cb95 Make libmpdvdkit2 compilation slightly more consistent with the other modules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-30 08:28:58 +00:00
diego
3f5d9a7a21 Remove bogus warning about missing font.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20236 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 13:59:26 +00:00
diego
1a6649aa5c Create target for mplayer-rc.o so that it is not rerun unconditionally.
based on patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20129 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 09:22:43 +00:00
rathann
f0996fb64c Disable linking mplayer with mp3lame when --disable-encoder=mp3lame is
passed to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20114 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 14:10:43 +00:00
rathann
915bfd16f0 Fix make install. 10l for Diego.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20017 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-02 00:51:29 +00:00
diego
5c422c2466 Work around ln limitations on MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20013 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 17:00:20 +00:00
diego
5e490d613c Remove version.h on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 15:55:10 +00:00
ods15
1b8971d82e Add demux_nut to MPlayer repo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 09:32:28 +00:00
diego
437c1c29ca Move MLIB_LIB to COMMON_LIBS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 22:35:07 +00:00
diego
9927cb669d Add --extra-libs option to pass linker flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19552 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 20:53:37 +00:00
diego
31f26e9a3f Disentangle toolame CFLAGS and LDFLAGS handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19531 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 14:28:39 +00:00
diego
824796ca11 Disentangle libdv and vorbis linker flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19530 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 13:32:22 +00:00
diego
6f690e732f cosmetics: Move some parts to more sensible places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19529 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 13:15:49 +00:00
diego
636106aee4 Fix MEncoder build when bitmap fonts are disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 16:25:56 +00:00
diego
50cc36d3c6 Remove useless else clauses.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19494 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 12:42:55 +00:00
diego
470943ebb7 Move libs common to MPlayer and MEncoder to COMMON_LIBS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 21:51:47 +00:00
diego
539cb1eb34 Simplify VIDIX lib handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 21:50:52 +00:00
diego
fafb459b35 cosmetics: Rename TREMOR variable to TREMOR_INTERNAL for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19357 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-07 20:58:39 +00:00
diego
4d82067c91 cosmetics: Rename some variables for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19354 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-07 08:57:43 +00:00
diego
25af97d3f6 Recurse into subdirs before cleaning the top level to avoid error messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19305 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 19:29:20 +00:00
diego
70d49ab5e8 'make distclean' should remove all generated files, so also config.[h|mak].
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19299 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 17:34:54 +00:00
diego
fffc1d306a 'make clean' now recurses through subdirectories as expected,
'make dirclean' can be used to clean just the toplevel directory.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 17:31:30 +00:00