Commit Graph

26747 Commits

Author SHA1 Message Date
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
diego ae09115f2b Merge mp3lib/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 22:53:18 +00:00
diego 835f0aaae6 Merge liba52/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 11:46:56 +00:00
diego f9857014b5 Remove unnecessary compilation command that shadows GNU Make builtin command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26553 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 11:00:06 +00:00
diego 15aeb0c9ca Remove unnecessary -lm linker flag from test program compilation command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26552 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 10:34:24 +00:00
diego 83740c48da Merge libmpeg2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 18:02:23 +00:00
diego 5e90929e2d clean and distclean rules do the same thing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26550 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 16:59:26 +00:00
diego 67d6784626 clean and distclean rules do the same thing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26549 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 16:58:15 +00:00
diego 3f94c61854 Merge vidix/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 12:47:24 +00:00
diego dc7ffa9855 Merge clean and distclean rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26547 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 11:17:17 +00:00
diego 03bfbfb8ca Mark alltools target as phony.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:59:33 +00:00
diego 21c9bd3b8b Only compile libmpcodecs/ve_qtvideo.c on Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:53:32 +00:00
diego be85def657 Add alltools target and variable to build non-linking tools.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:31:05 +00:00
diego 062a179f5f Only add vidix to parts when VIDIX is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:27:58 +00:00
diego 6b593fd363 Take Objective C files into account when generating dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:19:41 +00:00
diego e362640899 Add rule for generating dependency files from Objective C files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:16:15 +00:00
diego 59f2911c3e Revert accidentally committed changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26540 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 17:07:22 +00:00
diego ffed0ab3d2 Only add loader to parts if WIN32DLL is enabled.
Plus, some unrelated changes to mp3lib/Makefile committed by accident.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:58:31 +00:00
diego 1a35efe7f7 Ignore test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26538 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:54:24 +00:00
diego fb145ef6bc Only compile decode_i586.c on x86_32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26537 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:51:58 +00:00
diego e58ca8c5da Remove useless comments with compilation commands.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26536 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:39:03 +00:00
diego ba6cc3387e Fix test program linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26535 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:37:47 +00:00
diego ef59dbd347 Add return statement, fixes the warning:
test.c:75: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26534 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:34:26 +00:00
diego 8aa012384d Remove redundant declaration, fixes the warning:
test.c:15: warning: redundant redeclaration of 'gCpuCaps'
../cpudetect.h:53: warning: previous declaration of 'gCpuCaps' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26533 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:33:43 +00:00
diego c41f3b9244 Add return statement, fixes the warning:
test2.c:72: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26532 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:32:26 +00:00
diego d0e5a5224b Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26531 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:30:43 +00:00
diego b8d8895381 Add missing #include, fixes the warning:
test2.c:65: warning: implicit declaration of function 'memcpy'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26530 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:30:12 +00:00
diego 3b68802ccc Take name of getch file to link against from config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26529 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:28:33 +00:00