Mercurial > mplayer.hg

changeset 21091:f83859352e36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for disabling MPlayer compilation.
author diego
date Mon, 20 Nov 2006 16:14:01 +0000
parents 777e1db59946
children d6ee95051259
files Makefile configure
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Nov 20 14:49:08 2006 +0000
+++ b/Makefile	Mon Nov 20 16:14:01 2006 +0000
@@ -163,7 +163,9 @@
 OBJS_MPLAYER += osdep/mplayer-rc.o
 endif
 
+ifeq ($(MPLAYER),yes)
 ALL_PRG = mplayer$(EXESUF)
+endif
 ifeq ($(MENCODER),yes)
 ALL_PRG += mencoder$(EXESUF)
 endif
--- a/configure	Mon Nov 20 14:49:08 2006 +0000
+++ b/configure	Mon Nov 20 16:14:01 2006 +0000
@@ -212,6 +212,7 @@
 
 Optional features:
   --disable-mencoder     disable MEncoder (A/V encoder) compilation [enable]
+  --disable-mplayer      disable MPlayer compilation [enable]
   --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]
   --enable-gtk1          force using GTK 1.2 for the GUI  [disable]
   --enable-largefiles    enable support for files > 2GB [disable]
@@ -1561,6 +1562,7 @@
 _libpostproc_so=auto
 _libavcodec_mpegaudio_hp=yes
 _mencoder=yes
+_mplayer=yes
 _x11=auto
 _xshape=auto
 _dga=auto	# 1 2 no auto
@@ -1735,6 +1737,8 @@
   # Real 2nd pass
   --enable-mencoder)	_mencoder=yes	;;
   --disable-mencoder)	_mencoder=no	;;
+  --enable-mplayer)	_mplayer=yes	;;
+  --disable-mplayer)	_mplayer=no	;;
   --enable-dynamic-plugins) _dynamic_plugins=yes ;;
   --disable-dynamic-plugins) _dynamic_plugins=no ;;
   --enable-x11)		_x11=yes	;;
@@ -7465,6 +7469,7 @@
 X264 = $_x264
 LIBNUT = $_nut
 CONFIG_DTS = $_libdts
+MPLAYER = $_mplayer
 MENCODER = $_mencoder
 CDDA = $_cdda
 BITMAP_FONT = $_bitmap_font