Mercurial > mplayer.hg

changeset 19482:a917f318c1b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify VIDIX lib handling.
author diego
date Mon, 21 Aug 2006 21:50:52 +0000
parents 5890c54b755c
children fa86e7d57d1b
files Makefile
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Aug 21 21:46:59 2006 +0000
+++ b/Makefile	Mon Aug 21 21:50:52 2006 +0000
@@ -70,6 +70,9 @@
           $(CACA_LIB) \
 	  $(VESA_LIB) \
 
+ifeq ($(VIDIX),yes)
+VO_LIBS += vidix/libvidix.a
+endif
 ifeq ($(EXTERNAL_VIDIX),yes)
 VO_LIBS += $(EXTERNAL_VIDIX_LIB)
 endif
@@ -355,12 +358,6 @@
 
 MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a
 
-ifeq ($(VIDIX),yes)
-VIDIX_LIBS = vidix/libvidix.a
-else
-VIDIX_LIBS =
-endif
-
 ifeq ($(TARGET_WIN32),yes)
 OBJS_MPLAYER += osdep/mplayer-rc.o
 endif
@@ -369,7 +366,6 @@
                libao2/libao2.a \
                input/libinput.a \
                $(MENU_LIBS) \
-               $(VIDIX_LIBS) \
                $(GUI_LIBS) \
                $(COMMON_LIBS) \
                $(VO_LIBS) \