Commit Graph

452 Commits

Author SHA1 Message Date
diego bfce0b673d Move osdep/mplayer.rc handling to the osdep Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21205 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 09:49:18 +00:00
nplourde ac04dcd625 added mmap_anon to osdep lib. Used in loader for now
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21203 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 01:22:20 +00:00
diego 58a9204e79 Make loader Makefile non-recursive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21201 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 00:31:07 +00:00
diego db1997e695 LIBS vs LDFLAGS typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21147 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:58:39 +00:00
diego 37fd66bd41 Split libs that are dependencies and those that are just linker flags.
Fixes spurious rebuilds of MPlayer and MEncoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:42:20 +00:00
diego 84cbc3b50c Treat fontconfig and FreeType linker flags just like any other linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:20:32 +00:00
diego d021529c71 cosmetics: EXTRA_LIB_MENCODER --> EXTRALIBS_MENCODER
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21140 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:23:35 +00:00
diego 95de8f239f Remove libdha from LIBS_MPLAYER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21134 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:40:53 +00:00
diego cc9eb2aac3 Move FFmpeg library dependencies into the Makefile just like everything else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:49:46 +00:00
diego 43c4abaf0c Merge MPlayer-specific libs into one variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:12:19 +00:00
diego 6178e38e46 Split libvo.a into two libs so that libosd.a can be used by MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:49:47 +00:00
diego 3f6df7b998 Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21122 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:35:41 +00:00
diego 91a713bcc7 Add VIDIX to LIBS_MPLAYER directly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21119 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:21:09 +00:00
diego 2b1b586634 Add support for disabling MPlayer compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:14:01 +00:00
diego aa883180fb Oops, the loader stuff needs to be in COMMON_LIBS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21106 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:49:08 +00:00
diego 71c7b6353e Deliver dependency handling from redundancy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21105 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:45:33 +00:00
diego 6ea42bcf02 Remove MPlayer-specific dependencies from COMMON_DEPS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21104 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:27:00 +00:00
diego 4086945ce6 VIDIX is for MPlayer only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21103 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:57:12 +00:00
diego 9314030e44 The GUI is only for MPlayer, not MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21102 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:39:36 +00:00
diego 71a08757e8 Rename variables for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21101 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:38:21 +00:00
diego 6437823387 Simplify gui and menu libs handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:34:47 +00:00
diego e2da505741 cosmetics: Move some stuff around for better readability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21099 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:00:26 +00:00
diego bbe643b5b1 Clean up PARTS handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21097 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:20:37 +00:00
diego cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
diego efdd1c240b Uninstall should run all parts unconditionally.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21095 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:14:11 +00:00
diego 519c0331bd Remove nonsense ifeq around MEncoder target and variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21094 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:13:40 +00:00
diego f537fa351d Put libdvdcss under a separate ifeq.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21086 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:18:57 +00:00
diego 8cf4397274 Rename libdvdread to dvdread. We really only include only the dvdread
subdirectory of libdvdread.  This will also allow getting rid of some
local modifications.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 00:33:01 +00:00
diego f06a2b11a0 The addition of loader/ to PARTS depended on a non-existing variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20835 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 16:39:13 +00:00
rathann 866ba3f296 Disable linking mplayer (and internal static libavcodec) with
libmp3lame/faac/x264 if --disable-encoder=mp3lame/faac/x264
options are passed to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20827 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 23:14:33 +00:00
diego b31b19858f 10l: Overlooked one $(EXESUF) addition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20807 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 23:45:15 +00:00
diego 78a3bf6c9b Create binaries with proper executable suffix under Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20771 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 00:13:33 +00:00
diego 3829ecb1a2 Remove remnants of long-gone libfame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20739 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 22:57:14 +00:00
diego 0384045e30 Streamline and simplify internal vs external libdvdread handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20651 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 22:03:58 +00:00
kraymer 630302ad63 remove charset files (all of them are in UTF-8 now anyway)
change build system accordingly


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20650 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 21:52:35 +00:00
diego 376951ca72 libmpdvdkit2 --> libdvdread, it just contains libdvdread now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20631 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 13:48:52 +00:00
diego 689d0cc0f4 Move libdvdcss into its own subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20629 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 12:25:56 +00:00
diego 551d22810f Run dirclean instead of clean on distclean, this way we only need to
recurse through subdirectories once.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20558 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 13:34:17 +00:00
diego dd3fa699eb Unification of linker option handling, part 1 of many.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20555 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 12:52:05 +00:00
diego 0e80da24d1 CFLAGS are not necessary for linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 12:41:29 +00:00
diego 9261f1cb95 Make libmpdvdkit2 compilation slightly more consistent with the other modules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-30 08:28:58 +00:00
diego 3f5d9a7a21 Remove bogus warning about missing font.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20236 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 13:59:26 +00:00
diego 1a6649aa5c Create target for mplayer-rc.o so that it is not rerun unconditionally.
based on patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20129 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 09:22:43 +00:00
rathann f0996fb64c Disable linking mplayer with mp3lame when --disable-encoder=mp3lame is
passed to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20114 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 14:10:43 +00:00
rathann 915bfd16f0 Fix make install. 10l for Diego.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20017 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-02 00:51:29 +00:00
diego 5c422c2466 Work around ln limitations on MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20013 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 17:00:20 +00:00
diego 5e490d613c Remove version.h on distclean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 15:55:10 +00:00
ods15 1b8971d82e Add demux_nut to MPlayer repo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 09:32:28 +00:00
diego 437c1c29ca Move MLIB_LIB to COMMON_LIBS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 22:35:07 +00:00
diego 9927cb669d Add --extra-libs option to pass linker flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19552 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 20:53:37 +00:00