1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:12:25 +00:00
Commit Graph

26724 Commits

Author SHA1 Message Date
diego
06b5ea6b44 Make the default target depend on the recurse target again so that the
all necessary subdirectories are recursed by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26605 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:37:49 +00:00
diego
887c305ee7 Explicitly declare which dependency files need generated headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26604 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 12:19:04 +00:00
diego
405385d0ba Use consistent include paths, we always build from the top level now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26603 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 11:06:07 +00:00
diego
7d560418f6 Remove unnecessary version.h #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 11:03:41 +00:00
diego
63ffa0af9e Rebuild version.h only when the working directory was updated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26601 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 10:57:45 +00:00
diego
c785db9a0b Sync codec short name changes from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26600 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 09:30:05 +00:00
diego
2e30b5c260 Move CFLAGS setting to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26599 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 22:27:50 +00:00
compn
f6aa0e996a change cvs > svn
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26598 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 17:54:54 +00:00
compn
3b374ac091 add info lines to ffmimic, ffkmvc. fixes codec-status table.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26597 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 17:45:41 +00:00
diego
092b951e23 Link tools against mp_msg-mencoder.o instead of mp_msg.o.
The latter may depend on the GUI and cause link failures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26596 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 09:19:03 +00:00
diego
39723967ed Merge mpcommon.mak into Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26595 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:53:08 +00:00
diego
b4c9a8858f cosmetics: Move version.h/help_mp.h generation rules to a better place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26594 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:35:58 +00:00
diego
d663d7facb 10l: Add missing \ for line continuation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26593 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:05:44 +00:00
diego
281fe4b483 Do not rebuild version.h at every Makefile change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26592 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 08:04:59 +00:00
diego
838d308e41 Convert clean/distclean into non-recursive targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26591 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:37:35 +00:00
diego
e1d2feecca Remove generated headers and generated helper binaries only on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26590 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:10:55 +00:00
diego
532b9ab814 Remove unnecessary dependency declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26589 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 07:00:27 +00:00
diego
db1be5d74e Merge nearly identical SRCS_COMMON lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26588 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-29 06:59:11 +00:00
diego
7398abf389 Get rid of now obsolete library rules and variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:34:59 +00:00
diego
71272215d4 cosmetics: Reorder commands in (dist)clean targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:45 +00:00
diego
2c5869a10b Remove '-' prefix from 'rm -f' commands for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:07 +00:00
diego
acf602f12e Mark phony checkheaders target as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26584 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 17:57:44 +00:00
diego
75e96820c4 Merge now redundant clean and distclean rules into the top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 17:54:14 +00:00
ulion
d90a7e0283 Force to uint64_t first to avoid direct conversion from double to unsigned int.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26582 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:57:31 +00:00
diego
d4f42c4d46 Remove code for .depend generation, inclusion and related hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:42:36 +00:00
diego
d73a7beb00 .depend should no longer be ignored.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26580 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:41:30 +00:00
diego
17e278294a Run 'make depend', not 'make .depend' in FFmpeg subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:36:00 +00:00
diego
d5dfadb697 Remove unnecessary CFLAGS hack.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:20:15 +00:00
diego
2582357923 Remove unnecessary -I.. from CFLAGS, change -I../libavutil to -Ilibavutil.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26577 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:19:50 +00:00
diego
0792780cb7 Use consistent #include paths without "../".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:50:24 +00:00
diego
df2124e18f Use full path for libavutil #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:44:10 +00:00
diego
2f690cb652 Consistently #include mpbswap.h instead of bswap.h everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26574 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:43:30 +00:00
diego
238670ae7c Merge loader/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:01:58 +00:00
diego
928c5fb69d Restore line mistakenly commented out in the last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:31:00 +00:00
diego
558e30b12c Make sure all autogenerated .h and .c files exist in the vidix subdirectory
before trying to create object or dependency files there.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:28:36 +00:00
diego
9a885b71aa Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwards
anyway. The calls were missing parameters and caused compilation failures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:07:01 +00:00
diego
09e2855266 Add missing ldt_keeper.h #include; this fixes a bunch of implicit declaration
of function warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26569 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:05:25 +00:00
diego
ac3e5f24e9 Merge TEST_OBJS and TEST_LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26568 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:41:39 +00:00
diego
a3cef8cd25 Add -g to CFLAGS, not to LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26567 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:39:15 +00:00
diego
944489b835 Merge test program compilation rules using patterns.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26566 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:35:20 +00:00
diego
305dfe091f Add CFLAGS to test program compilation commands.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26565 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:34:30 +00:00
diego
181b0a7a46 Add missing ../osdep/mmap_anon.o to TEST_OBJS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26564 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:32:23 +00:00
diego
e59cb06784 Remove unnecessary linker flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26563 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:31:24 +00:00
diego
35649cad4a Add missing #include, fixes the warning:
qtx/qtxload.c:50: warning: implicit declaration of function 'mp_msg_init'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26562 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:03:52 +00:00
diego
7f6d9b2b91 Adjust printf length modifier, fixes the warning:
qtx/list.c:54: warning: format '%d' expects type 'int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26561 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:01:13 +00:00
diego
f2d8773fca Comment out variables only used in commented-out code, fixes the warnings:
qtx/qtxload.c:46: warning: unused variable 'i'
qtx/qtxload.c:45: warning: unused variable 'esp'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26560 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:57:38 +00:00
diego
5540775eb8 Link against individual objects, the osdep library is not generated anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26559 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:55:21 +00:00
diego
a001647301 Remove obsolete and non-working test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26558 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:52:56 +00:00
diego
df22d5fd5d Make OBJS depend on the recurse target instead of just the all target.
This fixes 'make mplayer' and 'make mencoder'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:22:25 +00:00
diego
caca521296 Remove .S files from list of files to generate dependencies for.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 10:44:59 +00:00