summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28087Uoti Urpala2008-12-041-5/+60
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Treat video output objects the same as everything else in the build system,diego2008-12-031-6/+44
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename ZORAN Makefile variable to ZR for consistency.diego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat audio output objects the same as everything else in the build system,diego2008-12-031-2/+19
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28075 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compileUoti Urpala2008-12-021-1/+1
| | | | | | | | | | | | | | | | codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags.
* | Merge svn changes up to r28065Uoti Urpala2008-12-021-0/+1
|\|
| * MNG demuxer by Stefan Schuermans, stefan blinkenarea orgdiego2008-11-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Add yasm support to the build system.bircoph2008-11-161-2/+2
| | | | | | | | | | | | | | | | This allows to use yasm assembler optimizations from FFmpeg code, in particular, from libavcodec/fft.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27940 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Create LIBDIR for binary codecs upon make install.diego2008-10-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27793 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27682Uoti Urpala2008-10-021-2/+1
|\| | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * 10l: Remove deleted file libmpeg2/motion_comp_iwmmxt.c from Makefile as well.diego2008-10-011-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27678 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27649Uoti Urpala2008-09-201-4/+4
|\| | | | | | | | | | | | | Conflicts: Makefile configure libvo/x11_common.c
| * Add shared libswscale support.rathann2008-09-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27632 b3059339-0415-0410-9bf9-f77b7e298cf2
| * External liba52 support, part 2 of 2.rathann2008-09-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use standard -I flags to compile codec-cfg.diego2008-09-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27618 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27514Uoti Urpala2008-09-031-16/+13
|\|
| * Rename internal libdvdread fork from dvdread to libdvdreadrathann2008-08-301-11/+11
| | | | | | | | | | | | | | | | to avoid clashing with external libdvdread. (Sync with libdvdread r1122) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove SKIP_DEPS trick. The same effect can be achieved without it.diego2008-08-181-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg no longer has fastmemcpy support, so no longer trigger recursingdiego2008-08-141-1/+1
| | | | | | | | | | | | | | into the FFmpeg directories if libvo/fastmemcpy.h changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-121-0/+7
|\|
| * Add VIDIX driver for SuperH Mobile VEU hardware block.ben2008-08-111-0/+1
| | | | | | | | | | | | | | | | Patch by Magnus Damm <magnus dot damm at gmail dot com>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27452 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Skip dependency generation if we just run distclean or if skippingdiego2008-08-091-0/+6
| | | | | | | | | | | | | | is requested explicitly on the command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27443 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-98/+99
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Add separate variables for CFLAGS that are specific to internal librariesdiego2008-08-071-2/+4
| | | | | | | | | | | | | | and only add them to CFLAGS when compiling objects from those libraries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename some CFLAGS-related variables.diego2008-08-071-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27434 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Remove stray backslash at end of line.diego2008-08-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27433 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge two redundantly declared lines into one.diego2008-08-071-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27432 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Sort things into alphabetical order in various places.diego2008-08-071-88/+88
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27431 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-2/+2
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.diego2008-08-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert mistakenly committed temporary local change.diego2008-08-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27405 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-1/+1
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of video-output-specific preprocessor directives from a HAVE_diego2008-08-021-4/+4
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Use conditional compilation instead of an #ifdef around the whole file.diego2008-07-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile anddiego2008-07-281-2/+2
| | | | | | | | | | | | | | use them only when compiling objects from those subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27359 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert to previous dependency checking behavior.diego2008-07-261-1/+0
| | | | | | | | | | | | | | | | | | Take included header files into account when generating dependency files. This has problems when header files are removed or renamed, but does not silently miscompile files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27351 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Uoti Urpala2008-07-211-5/+5
|\|
| * Remove "en" from list of all man page languages when generating man pagediego2008-07-191-2/+2
| | | | | | | | | | | | | | installation rules from a pattern. There is a separate rule for English above. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27330 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rewrite translation handling in the build system.diego2008-07-171-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Evaluate man page installation rule for all available languages,diego2008-07-171-4/+4
| | | | | | | | | | | | | | but only install the requested languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27307 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27281Uoti Urpala2008-07-151-0/+1
|\|
| * Dependency files should be refreshed when object files are rebuilt.diego2008-07-121-0/+1
| | | | | | | | | | | | | | | | Express this with Makefile syntax instead of in the dependency file generation command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27268 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27242Uoti Urpala2008-07-091-20/+21
|\| | | | | | | | | | | | | Conflicts: Makefile configure
| * Introduce DRIVER_OBJS variable for list of all driver targets.diego2008-07-061-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27223 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify codecs.conf.h generation rule.diego2008-07-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27222 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge version.h dependency declarations.diego2008-07-061-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27221 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove redundant dependencies for .rc files.diego2008-07-061-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27220 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a generic rule for .rc files and use it.diego2008-07-061-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27219 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Merge three lines into two.diego2008-07-061-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27218 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also remove dhahelper and dhahelperwin on distclean.diego2008-07-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27217 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename ALLPARTSLIBS variable to FFMPEGLIBS.diego2008-07-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27205 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Group some variable declarations together in sensible places.diego2008-07-051-4/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27204 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare FFmpeg dependencies in a more elegant way using the PARTS variable.diego2008-07-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27203 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-14/+17
|\|
| * Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.diego2008-07-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify tool generation rules with a pattern rule.diego2008-07-041-9/+8
| | |