Mercurial > mplayer.hg

diff Makefile @ 20108:8833560dba2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable linking mplayer with mp3lame when --disable-encoder=mp3lame is passed to configure.
author rathann
date Sun, 08 Oct 2006 14:10:43 +0000
parents 789a3556bcd4
children aaec1eff2e86
line wrap: on
line diff
--- a/Makefile	Sun Oct 08 13:49:16 2006 +0000
+++ b/Makefile	Sun Oct 08 14:10:43 2006 +0000
@@ -99,7 +99,6 @@
              $(THEORA_LIB) \
              $(FAAD_LIB) \
              $(LIBLZO_LIB) \
-             $(DECORE_LIB) \
              $(XVID_LIB) \
              $(DTS_LIB) \
              $(PNG_LIB) \
@@ -112,6 +111,10 @@
              $(SPEEX_LIB) \
              $(NUT_LIB) \
 
+ifeq ($(LAVC_MP3LAME),yes)
+CODEC_LIBS += $(MP3LAME_LIB)
+endif
+
 ifeq ($(TOOLAME),yes)
 CODEC_LIBS += $(TOOLAME_LIB)
 endif
@@ -388,7 +391,7 @@
 
 ifeq ($(MENCODER),yes)
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
-                $(ENCORE_LIB) \
+                $(MP3LAME_LIB) \
                 $(COMMON_LIBS) \
 
 $(PRG_MENCODER): $(MENCODER_DEP)