diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-21 21:50:52 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-21 21:50:52 +0000 |
| commit | 539cb1eb346ce6a607b20e55da2daec2a334ec79 (patch) | |
| tree | 68816c5824fc408f48b64087b473b7d5a10c9eaa | |
| parent | 748d139e19f3c6412af18384d1a5ba03c3d9201c (diff) | |
| download | mpv-539cb1eb346ce6a607b20e55da2daec2a334ec79.tar.bz2 mpv-539cb1eb346ce6a607b20e55da2daec2a334ec79.tar.xz | |
Simplify VIDIX lib handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19488 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -70,6 +70,9 @@ VO_LIBS = $(AA_LIB) \ $(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 @@ endif 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 @@ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ input/libinput.a \ $(MENU_LIBS) \ - $(VIDIX_LIBS) \ $(GUI_LIBS) \ $(COMMON_LIBS) \ $(VO_LIBS) \ |