1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 21:06:00 +00:00
Commit Graph

26510 Commits

Author SHA1 Message Date
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
diego
61d97d630e Merge dvdread/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:25:17 +00:00
diego
45ca5e0930 DVDCSS_INTERNAL has been renamed to LIBDVDCSS_INTERNAL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26527 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 00:01:56 +00:00
diego
49aea49605 Merge libfaad2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 23:11:16 +00:00
diego
cc339fac3a Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:30:50 +00:00
diego
4267826b6b Merge libdvdcss/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:27:01 +00:00
diego
aaf2c51e8a Merge libmpdemux/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:05:43 +00:00
diego
83f7e53eca Explicitly include dependency information in top-level Makefile.
The inclusion is skipped in mpcommon.mak.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 21:58:45 +00:00
diego
e7f6edf300 dependency generation infrastructure for C++ files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 21:46:50 +00:00
diego
b5653b5698 Include mpcommon.mak before declaring dependencies, which require mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 17:41:19 +00:00
diego
1b7adb6822 Make sure necessary header files are created before recursing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 17:26:57 +00:00
diego
6a23615946 #include base64.h with full path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26518 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 16:49:31 +00:00
diego
a2d82df9cc Move libfaad2 fixed-point CFLAGS setting to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26517 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 16:41:44 +00:00
diego
9551fc7e63 Expand conditional addition of elements to variables with a form that permits
using two conditions. This allows getting rid of some ifeqs in Makefiles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 15:32:44 +00:00
diego
ab5d23b620 Merge stream/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:38:12 +00:00
diego
20ef914470 Merge libmpcodecs/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:04:50 +00:00
diego
a2073799ac cosmetics: alphabetical order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26513 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 10:12:02 +00:00
corey
0decac38d3 consistently print fps with three digits of precision
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26512 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 20:20:25 +00:00
corey
83f1331817 use existing MSGTR_FilefmtFourccSizeFpsFtime translatable string macro
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26511 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 20:14:14 +00:00
diego
c051bef87c There is no need to remove .a files from subdirectories, they are only
created in the directories using recursive make.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26510 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:09:12 +00:00
diego
4e2837a2e8 Merge libvo/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 10:07:50 +00:00
diego
9785107814 EXTRAXX_INC flags should now be added to .depend compilation,
not to the phony depend target.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26508 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:42:09 +00:00
diego
2bcda50ffe Merge libao2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:33:51 +00:00
diego
e8d9d7db4e Remove useless 0 flag from s printf conversion specifier, fixes the warning:
TOOLS/movinfo.c:332: warning: '0' flag used with '%s' printf format


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26506 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:24:54 +00:00
reimar
ea35e0563d Take audio delay into account when seeking in avisynth demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26505 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 07:50:54 +00:00
reimar
4fd37efa40 Calculate fps as double-precision to make switching to double-precision fps values easier.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26504 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 07:49:51 +00:00
diego
36add9a774 Merge tremor/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 23:05:27 +00:00
diego
8784ae223d Move Tremor low accuracy CFLAGS handling to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26502 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:55:55 +00:00
diego
a7dc8352ef Only add loader to PARTS on x86.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26501 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:39:26 +00:00
diego
41be611f0a .depend has to get all the CFLAGS that the files it contains dependency
information for need.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26500 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:14:06 +00:00
diego
a936979f76 Create standard recursive rules from a template.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26499 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:00:37 +00:00
diego
916058bd22 Use directory name as library name template.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:51:41 +00:00
nicodvb
5c1be94ba3 added support for dvdread-config (from our svn), called as fallback when dvdread isn't detected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26497 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:48:28 +00:00
diego
da8d898ffe Simplify phony target declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:21:46 +00:00
diego
2d58dcd67c Add an unconditional phony recurse rule and make the binaries depend on it.
This assures that all directories that use recursive make are descended into.
This way cross-directory dependencies are taken into account through the
.depend files that record them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26495 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 21:20:42 +00:00
attila
5d9b672c3a revert commits 26437-26439 the right way[tm]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26494 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 20:05:02 +00:00
diego
61e9f32d6a Only add available CPU extensions to config.mak.
Fixes compilation on non-x86 after latest FFmpeg changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26493 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 19:46:08 +00:00
diego
b670c39ced Move phony target declaration to the bottom of the file; add distclean target.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26492 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 10:19:30 +00:00