summaryrefslogtreecommitdiffstats
path: root/common.mak
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29277Uoti Urpala2009-05-081-45/+20
|\
| * Sync with latest FFmpeg changes.diego2009-04-131-47/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29176 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-3/+3
|\|
| * Sync with latest FFmpeg changes.diego2009-02-071-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28479 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-1/+1
|\|
| * Sync with latest FFmpeg changes.diego2008-12-221-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28178 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile, common.mak: Create .d files when creating corresponding .oUoti Urpala2008-12-061-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-9/+26
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Sync with latest FFmpeg changes.diego2008-11-081-9/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27902 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-9/+10
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Sync with latest FFmpeg changes.diego2008-05-091-9/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26703 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26587Uoti Urpala2008-04-291-1/+1
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
* | Make MPlayer build with a complete FFmpeg checkout in ffmpeg/Uoti Urpala2008-04-281-1/+1
|/ | | | | | | | | | | | Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/, libavformat/, libpostproc/ subdirectories make MPlayer build with a complete checkout of FFmpeg under ffmpeg/. configure now creates config.mak and config.h at both the top level and in ffmpeg/. The config.h files are identical. The config.mak for FFmpeg has different include paths. The top-level common.mak and subdir.mak are now used by libswscale only; the directories under ffmpeg/ use the versions in ffmpeg/.
* Sync with latest FFmpeg changes.diego2008-04-131-9/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26435 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge simplifications from FFmpeg r12764.diego2008-04-081-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26349 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg's shiny new non-recursive build system.diego2008-04-071-86/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26347 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r12599diego2008-03-261-14/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26278 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r12398diego2008-03-101-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26217 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r12354diego2008-03-071-9/+28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26187 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r10874diego2007-10-301-11/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24886 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r10774.diego2007-10-181-25/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24803 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r9278.diego2007-06-101-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23544 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r7699.diego2007-01-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22010 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r7634.diego2007-01-211-4/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21993 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r7167.diego2006-11-251-7/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21226 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6700.diego2006-10-151-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6642.diego2006-10-111-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6563.diego2006-10-051-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20074 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6543.diego2006-10-031-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20022 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r5930diego2006-08-131-24/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19381 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r5718diego2006-07-111-18/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19021 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with upstream.diego2006-04-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18312 b3059339-0415-0410-9bf9-f77b7e298cf2
* update config.mak to match ffmpeg's version (fix alpha compilation)aurel2006-02-271-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17701 b3059339-0415-0410-9bf9-f77b7e298cf2
* Import common.mak v1.1 from ffmpeg cvs, now it's needed by the buildingrtognimp2006-02-141-0/+97
system git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17628 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 17:55:09 +0000