summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28951Uoti Urpala2009-03-141-19/+5
|\
| * KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian netdiego2009-03-141-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile fastmemcpybench on x86.diego2009-03-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28945 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix and restructure fastmemcpybench. It is now one binary that runs alldiego2009-03-101-19/+3
| | | | | | | | | | | | | | available memcpy variants and prints benchmark results about them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28929 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove native nuv demuxer, it only needs more code to achieve the same thingreimar2009-03-091-1/+0
| | | | | | | | | | | | | | as the libavformat demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make fastmemcpybench almost working - only thing missing is a way toreimar2009-03-091-2/+2
| | | | | | | | | | | | | | override HAVE_MMX etc. from config.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28906 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix fastmemcpybench tools build:diego2009-03-091-11/+15
| | | | | | | | | | | | | | | | - HAVE_MMX and friends now have 0/1 values and are always defined. - Use proper file dependencies instead of a phony target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28899 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add test for C memcpy()michael2009-03-081-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28894 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rtjpegn.c is only needed by the NuppelVideo encoder, change Makefile accordinglyreimar2009-03-081-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28889 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove internal NuppelVideo decoder, the code in libavcodec can decodereimar2009-03-081-2/+0
| | | | | | | | | | | | | | those files and some more and is far more maintainable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-20/+20
|\|
| * Only add -Ilibdvdnav to the CFLAGS of the files that require it.diego2009-03-051-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify CFLAGS generation for individual targets.diego2009-03-051-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28827 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify some vidix dhahelper build commands with automatic make variables.diego2009-03-051-5/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28815 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DART audio output driver for OS/2 by KO Myung-Hun, komh chollian netdiego2009-03-011-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix 10l typo in ADD_ALL_EXESUFS function name.diego2009-03-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28772 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codec-cfg does not depend on codecs.conf.h, it is used to generate it.diego2009-03-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make all object files depend on generated header files.diego2009-03-011-4/+2
| | | | | | | | | | | | | | | | This solution does not record precise dependencies but is robust against header dependency changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28770 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add explicit dependencies on generated header files for the object files alongdiego2009-03-011-1/+2
| | | | | | | | | | | | | | | | with the dependency information files. This fixes a straight build without generating dependency information. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28769 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix dependencies on generated header files for the codec* binaries.diego2009-03-011-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28712Uoti Urpala2009-02-231-0/+1
|\|
| * Add statistics audio filter that prints information about the audio stream.diego2009-02-211-0/+1
| | | | | | | | | | | | | | patch by Nicolas George, nicolas.george normalesup org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28696 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-0/+1
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * Add support for VDPAU video out, including hardware decoding.reimar2009-02-161-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28610Uoti Urpala2009-02-161-0/+1
|\|
| * Create a fmt-conversion.c file so fmt-conversion.h can be included by ↵reimar2009-02-141-0/+1
| | | | | | | | | | | | | | | | | | multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28549Uoti Urpala2009-02-131-34/+25
|\|
| * Ignore errors from all rm commands in clean targets.diego2009-02-121-12/+12
| | | | | | | | | | | | | | This way make will not stop on failure and remove as much as possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28540 b3059339-0415-0410-9bf9-f77b7e298cf2
| * On clean/distclean, remove binaries with all types of executable suffixes.diego2009-02-121-17/+17
| | | | | | | | | | | | | | This helps clean a tree completely before and after crosscompiling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28539 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use addprefix and addsuffix functions to generate TOOLS variable.diego2009-02-121-10/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28538 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-3/+4
|\|
| * Add priority support for OS/2 and factorize the Windows priority support.diego2009-02-101-0/+1
| | | | | | | | | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Conditionally compile aclib.c instead of placing #ifdef around its content.diego2009-02-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove stray tab.diego2009-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28464 b3059339-0415-0410-9bf9-f77b7e298cf2
| * We use libdvdcss 1.2.10, not 1.2.9.diego2009-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28463 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Uoti Urpala2009-02-041-4/+4
|\|
| * Remove -c option from install commands. It is ignored by GNU install anddiego2009-02-011-2/+2
| | | | | | | | | | | | | | incompatible with some other install commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly simplify VIDIX_PCI_FILES command.diego2009-01-311-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28410 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-12/+12
|\|
| * HAVE_3DNOW --> HAVE_AMD3DNOWdiego2009-01-261-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
| * version.h depends on version.sh.diego2009-01-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28369 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28366Uoti Urpala2009-01-261-2/+2
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * HAVE_3DNOWEX --> HAVE_3DNOWEXTdiego2009-01-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize print_version().diego2009-01-251-1/+1
| | | | | | | | | | | | | | Print CPU information in verbose mode instead of by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-11/+25
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Support an "internal" dvdnav version to make it easier to compile with,reimar2009-01-101-0/+14
| | | | | | | | | | | | | | test and debug dvdnav SVN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Switch internal dvdread to libdvdread SVN external.reimar2009-01-081-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-1/+1
|\|
| * libavcodec/i386/ was renamed to libavcodec/x86/.diego2008-12-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28177 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: Fix live555 compilationUoti Urpala2008-12-221-1/+1
| | | | | | | | | | | | The change to create .d files with .o incorrectly used CFLAGS instead of CXXFLAGS when compiling .cpp files. This broke the build if live555, which is the only part using C++ code, was enabled.
* | Merge svn changes up to r28162Uoti Urpala2008-12-191-2/+2
|\|
| * another round of armv4l --> arm changesdiego2008-12-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28159 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libavcodec/armv4l/ was renamed to libavcodec/arm/.diego2008-12-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28158 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: prevent default build rules being used on FFmpeg filesUoti Urpala2008-12-061-1/+5
| | | | | | | | | | | | | | | | | | After adding .o files to the dependencies of FFmpeg .a files make tried to build those .o files with default rules before recursing to the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix incorrectly placed parentheses in the command creating the FFMPEGFILES list. That resulted in some files being listed multiple times, triggering warnings from the dummy rule.
* | Makefile: Rebuild FFmpeg libraries when .asm and .o files changeUoti Urpala2008-12-061-1/+1
| | | | | | | | | | | | | | There was a missing dependency that meant FFmpeg libraries were not recursed if only .asm files changed. Also add a dependency on .o files to update the corresponding .a (though this case should only happen if you run compilation commands manually).
* | Makefile, common.mak: Create .d files when creating corresponding .oUoti Urpala2008-12-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The separate .d file creation logic has caused various problems, most notably cases where 'make' exits without doing anybut but without giving any error either. Change the Makefile so that .d files are always created or updated when the corresponding .o file is. This avoids the problems of current .d file generation and still gives correct dependencies. The common.mak change does the same for the libswscale build. However it does not affect the directories under ffmpeg/ because those use ffmpeg/common.mak. The MPlayer common.mak can be copied over the ffmpeg/common.mak file to make the fix apply to the FFmpeg directories too. This is not done automatically because the FFmpeg file is under version control and changing it could cause problems.
* | Makefile: Don't use "install -d" on existing directoriesUoti Urpala2008-12-061-3/+5
| | | | | | | | | | | | | | | | | | Makefile used "install -d" on directories like "/usr/local/bin". Because the install program always tries to set permissions this command causes an installation failure if the directory exists and is writable but you cannot change its permissions (default configuration for group staff on Debian for example). So avoid running such commands on existing directories.
* | 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
| | | | | | | | | | | | | | | |