70e0372a51
Merge svn changes up to r26510
...
r26469 and r26470 (which revert files to inferior versions "because
it's policy") are ignored.
2008-04-23 14:23:49 +03:00
95a909b4fd
Makefile: Compile and link talloc.c
2008-04-23 13:41:06 +03:00
9db0c118d3
Start of new option system
...
First part of option restructuring. The aim is to move option values
from a huge number of separate globals to a single non-global struct.
This part adds some support for parsing option values into such struct
instances, and moves one example option (fixed-vo) to the struct.
2008-04-23 13:41:05 +03:00
c051bef87c
There is no need to remove .a files from subdirectories, they are only
...
created in the directories using recursive make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26510 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:09:12 +00:00
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
2bcda50ffe
Merge libao2/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:33:51 +00:00
36add9a774
Merge tremor/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 23:05:27 +00:00
a7dc8352ef
Only add loader to PARTS on x86.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26501 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:39:26 +00:00
a936979f76
Create standard recursive rules from a template.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26499 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:00:37 +00:00
916058bd22
Use directory name as library name template.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:51:41 +00:00
da8d898ffe
Simplify phony target declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:21:46 +00:00
2d58dcd67c
Add an unconditional phony recurse rule and make the binaries depend on it.
...
This assures that all directories that use recursive make are descended into.
This way cross-directory dependencies are taken into account through the
.depend files that record them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26495 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:20:42 +00:00
88961299aa
Merge TOOLS/Makefile into the top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26487 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 08:50:38 +00:00
7c76c4a6f6
Add dependency information to recursive rules. While more eager than strictly
...
necessary, this should err on the side of unneeded recursion instead of
missing a necessary rebuild.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26467 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:53:42 +00:00
883033e8e3
Add missing recursive rule for libmpcodecs/libmpencoders.a.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26466 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:44:48 +00:00
8c791b38fa
cosmetics: Sort recursive rules alphabetically.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26465 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:43:53 +00:00
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
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
6187c8753b
10l: Rename remaining instances of $i to $lang.
...
patch by Andrew Savchenko, Bircoph list ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26457 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 07:16:22 +00:00
93699de705
Add libpostproc to list of pseudo-dependencies.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26445 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 22:57:47 +00:00
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
b099ea9c85
The TAGS and tags targets are not phony.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26443 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:21:42 +00:00
61baa13a58
Add gui subdirectories to DIRS instead of manually cleaning them.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26442 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:20:29 +00:00
9e0b5dc7f2
Replace shell for loop by proper make foreach construct.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26441 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:13:05 +00:00
0cf1308e21
Add Makefile variable for DVB OSD menu, saves one ifeq.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26434 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 10:44:21 +00:00
7bd7e50709
Restore compilation of osdep/mplayer-rc.o.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26431 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 07:57:35 +00:00
bfc3adaada
Makefile: Fix compilation on systems with dvb support
...
libmenu/menu_dvbin.c was added to sources if HAVE_DVBIN was defined,
even if LIBMENU was not defined. This caused a compilation failure on
systems with dvb support unless you ran configure with --enable-menu.
Fix by making compilation of menu_dvbin conditional on both HAVE_DVBIN
and LIBMENU.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26400 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 23:06:30 +00:00
99405ac93c
Merge ./gui/Makefile into ./Makefile, one less instance of recursive make.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26398 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 17:45:02 +00:00
196310b250
Ahem, libmenu objects should only be compiled when OSD menu is enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:18:28 +00:00
14ad1adcf3
if it's 'for lang in...' it's better off to use $$lang as a variable next ;)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26383 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-10 10:55:39 +00:00
b2f9633eab
10l: libass compilation should be conditional.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26379 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:33:26 +00:00
dc8d47d1eb
Merge libaf/Makefile into Makefile, one less instance of recursive make.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26376 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:15:21 +00:00
7bba082cb0
Restore osdep/mmap-os2.c compilation, which was accidentally removed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26363 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 14:13:30 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Uoti Urpala
diego
uau
ptt
reimar
ben
ulion