Commit Graph

84 Commits

Author SHA1 Message Date
diego cd1f6674cd Put a compilation fix bandaid in place for the png.h issue.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23802 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-17 10:56:16 +00:00
diego 2ea4746dce Remove incomplete compilation fix bandaid.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23792 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-16 20:12:43 +00:00
diego 4ab613d1a3 bandaid compilation fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23789 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-16 11:34:18 +00:00
diego ba82f36061 Add Makefile variable for either internal or external VIDIX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23086 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:19:00 +00:00
diego a1639b42de Readd an explicit rule for Objective C files. Apparently only Apple's fork of
GNU Make has an implicit rule for Objective C.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23085 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:16:29 +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 596859e524 Remove unnecessary -I option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22552 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 22:16:03 +00:00
diego 5519d98983 cosmetics: Fix indentation, reorder some lines for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 21:55:23 +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 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 ed5e0e9eec Add libav include paths to CFLAGS without indirection.
This Makefile was skipped in the initial commit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21409 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 11:27:21 +00:00
diego b7b22bd874 Remove some superfluous include CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:14:03 +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
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 21b6b9af3c FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21301 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:17:22 +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
diego 917d57bc25 Don't compile libvo.a unless MPlayer is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21245 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:56:00 +00:00
diego eee40df587 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:58:43 +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 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 7a4c86b2ca Remove unused -D from CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21121 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:29:26 +00:00
diego d52d16f96e Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +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 e8f5c06e76 support for disabling/enabling bitmap font support from configure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19491 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 23:19:11 +00:00
diego b02e7924b9 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-17 17:19:56 +00:00
diego 82300a99c6 consistency cosmetics: Handle includes just like in other Makefiles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19418 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-16 21:08:50 +00:00
diego 22b5b6d0f5 Unify include paths in the build system, part I.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 10:08:17 +00:00
diego f7d4dd174b OPTFLAGS already includes EXTRA_INC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19042 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 17:58:07 +00:00
diego 02a3a41923 Use only one global config.mak file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19039 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 17:28:14 +00:00
diego bc93e25299 Move conditional FreeType support compilation to the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18869 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-30 12:41:05 +00:00
nicodvb ec5ad59cdb added support for external VIDIX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-28 22:44:16 +00:00
diego 89d549f984 Make clean/distclean behave uniformly in all directories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-27 00:06:42 +00:00
diego 607067d6a7 Add -I../libavutil to the includes to fix building vo_zr[2].
patch by Corey Hickey <bugfood-ml - at - fatooh - dot - org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16332 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-01 10:44:46 +00:00
alex d4d939b57e gtf.{c,h} is used by vesa only
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16265 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-18 12:59:19 +00:00
ranma 2098665b8d Be more patch-friendly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15773 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-19 22:52:55 +00:00
wight 01907d1e68 If we use .m suffix we really should include it in .SUFFIXES
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15474 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-14 21:35:35 +00:00
nplourde 382d7cbca8 macosx core video module
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15292 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-29 11:41:07 +00:00
ivo 241d339efd Add --enable and --disable options for vo_pnm and vo_md5sum to configure.
It's now possible to compile libvo without pnm and/or md5sum support.
Default is enable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13745 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-23 22:43:19 +00:00
ivo 8cffc7853a Removal of vo_pgm and vo_md5, because they have been replaced by vo_pnm
and vo_md5sum. If one tries to use the old video output drivers, a message
is printed to direct them to the new drivers.

Manual page is updated (or is this called downdated? :-) ).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13508 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-29 01:46:30 +00:00
ivo a63a6ac5cb This patch enables the compilation and linking of vo_md5sum to libvo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13399 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-20 01:35:43 +00:00
ivo e5029c75b6 This patch enables the compilation and linking of vo_pnm (the portable
anymap video output driver) to libvo.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13398 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-20 01:31:26 +00:00
alex 838b00eb46 ranlib cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12635 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-24 13:54:08 +00:00
attila 3115b22def linux 2.6 patch by "ismail 'cartman' dönmez" <ismail.donmez@boun.edu.tr>
no idea whether this really works :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11766 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-10 09:48:15 +00:00
attila 791f52c526 Remove unused define
Patch by Götz Waschk <waschk@informatik.uni-rostock.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11575 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 09:38:25 +00:00
alex 70848671d3 --dvbincdir support by Gotz Waschk <waschk@informatik.uni-rostock.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10652 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-17 20:56:40 +00:00
arpi b39016d60f fixed order of includes.
there is /usr/local/include[/freetype/freetype.h]
and      /usr/local/include/freetype2[/freetype/freetype.h] ... what a mess!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8137 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-10 13:12:53 +00:00
mark a2dfc7a766 Added the -geometry option (supports fbdev and tdfxfb drivers)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7867 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 16:52:54 +00:00
arpi fd44bbee3d freetype 2.0/2.1+ support - disabled by default until bugs fixed
patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7123 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 20:52:02 +00:00
arpi 4ae1571dda General Timing Formula algorithm from a scratch.
vo_vesa.c so now adjust the timing to highest possible refresh rate using
the monitor capabilities from a config file.
patch by Rudolf Marek <MAREKR2@cs.felk.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7070 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-22 23:03:51 +00:00
atmos4 0b8054d7ad wtf..10l to dunno..only use x11_common.c when x11 is detected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6451 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-16 14:03:54 +00:00