aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge svn changes up to r28862Gravatar Uoti Urpala2009-03-07
|\
| * Only add -Ilibdvdnav to the CFLAGS of the files that require it.Gravatar diego2009-03-05
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify CFLAGS generation for individual targets.Gravatar diego2009-03-05
| | | | | | | | 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.Gravatar diego2009-03-05
| | | | | | | | 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 netGravatar diego2009-03-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix 10l typo in ADD_ALL_EXESUFS function name.Gravatar diego2009-03-01
| | | | | | | | 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.Gravatar diego2009-03-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make all object files depend on generated header files.Gravatar diego2009-03-01
| | | | | | | | | | | | | | | | 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 alongGravatar diego2009-03-01
| | | | | | | | | | | | | | | | 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.Gravatar diego2009-03-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28712Gravatar Uoti Urpala2009-02-23
|\|
| * Add statistics audio filter that prints information about the audio stream.Gravatar diego2009-02-21
| | | | | | | | | | | | | | 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 r28641Gravatar Uoti Urpala2009-02-18
|\| | | | | | | | | | | | | | | 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.Gravatar reimar2009-02-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28610Gravatar Uoti Urpala2009-02-16
|\|
| * Create a fmt-conversion.c file so fmt-conversion.h can be included by ↵Gravatar reimar2009-02-14
| | | | | | | | | | | | | | | | | | 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 r28549Gravatar Uoti Urpala2009-02-13
|\|
| * Ignore errors from all rm commands in clean targets.Gravatar diego2009-02-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.Gravatar diego2009-02-12
| | | | | | | | | | | | | | 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.Gravatar diego2009-02-12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28538 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Gravatar Uoti Urpala2009-02-12
|\|
| * Add priority support for OS/2 and factorize the Windows priority support.Gravatar diego2009-02-10
| | | | | | | | | | | | | | 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.Gravatar diego2009-02-08
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove stray tab.Gravatar diego2009-02-04
| | | | | | | | 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.Gravatar diego2009-02-04
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28463 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Gravatar Uoti Urpala2009-02-04
|\|
| * Remove -c option from install commands. It is ignored by GNU install andGravatar diego2009-02-01
| | | | | | | | | | | | | | 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.Gravatar diego2009-01-31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28410 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Gravatar Uoti Urpala2009-01-31
|\|
| * HAVE_3DNOW --> HAVE_AMD3DNOWGravatar diego2009-01-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
| * version.h depends on version.sh.Gravatar diego2009-01-26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28369 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28366Gravatar Uoti Urpala2009-01-26
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * HAVE_3DNOWEX --> HAVE_3DNOWEXTGravatar diego2009-01-25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize print_version().Gravatar diego2009-01-25
| | | | | | | | | | | | | | 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 r28310Gravatar Uoti Urpala2009-01-15
|\| | | | | | | | | | | | | | | 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,Gravatar reimar2009-01-10
| | | | | | | | | | | | | | 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.Gravatar reimar2009-01-08
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Gravatar Uoti Urpala2008-12-27
|\|
* | Makefile: Fix live555 compilationGravatar Uoti Urpala2008-12-22
| | | | | | | | | | | | 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.
| * libavcodec/i386/ was renamed to libavcodec/x86/.Gravatar diego2008-12-22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28177 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28162Gravatar Uoti Urpala2008-12-19
|\|
| * another round of armv4l --> arm changesGravatar diego2008-12-17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28159 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libavcodec/armv4l/ was renamed to libavcodec/arm/.Gravatar diego2008-12-17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28158 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: prevent default build rules being used on FFmpeg filesGravatar Uoti Urpala2008-12-06
| | | | | | | | | | | | | | | | | | 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 changeGravatar Uoti Urpala2008-12-06
| | | | | | | | | | | | | | 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 .oGravatar Uoti Urpala2008-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 directoriesGravatar Uoti Urpala2008-12-06
| | | | | | | | | | | | | | | | | | 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 r28087Gravatar Uoti Urpala2008-12-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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,Gravatar diego2008-12-03
| | | | | | | | | | | | | | | | 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.Gravatar diego2008-12-03
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2