mirror of
https://github.com/mpv-player/mpv
synced 2025-03-15 03:14:30 +01:00
Simplify VIDIX lib handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19488 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
748d139e19
commit
539cb1eb34
10
Makefile
10
Makefile
@ -70,6 +70,9 @@ VO_LIBS = $(AA_LIB) \
|
|||||||
$(CACA_LIB) \
|
$(CACA_LIB) \
|
||||||
$(VESA_LIB) \
|
$(VESA_LIB) \
|
||||||
|
|
||||||
|
ifeq ($(VIDIX),yes)
|
||||||
|
VO_LIBS += vidix/libvidix.a
|
||||||
|
endif
|
||||||
ifeq ($(EXTERNAL_VIDIX),yes)
|
ifeq ($(EXTERNAL_VIDIX),yes)
|
||||||
VO_LIBS += $(EXTERNAL_VIDIX_LIB)
|
VO_LIBS += $(EXTERNAL_VIDIX_LIB)
|
||||||
endif
|
endif
|
||||||
@ -355,12 +358,6 @@ endif
|
|||||||
|
|
||||||
MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a
|
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)
|
ifeq ($(TARGET_WIN32),yes)
|
||||||
OBJS_MPLAYER += osdep/mplayer-rc.o
|
OBJS_MPLAYER += osdep/mplayer-rc.o
|
||||||
endif
|
endif
|
||||||
@ -369,7 +366,6 @@ LIBS_MPLAYER = libvo/libvo.a \
|
|||||||
libao2/libao2.a \
|
libao2/libao2.a \
|
||||||
input/libinput.a \
|
input/libinput.a \
|
||||||
$(MENU_LIBS) \
|
$(MENU_LIBS) \
|
||||||
$(VIDIX_LIBS) \
|
|
||||||
$(GUI_LIBS) \
|
$(GUI_LIBS) \
|
||||||
$(COMMON_LIBS) \
|
$(COMMON_LIBS) \
|
||||||
$(VO_LIBS) \
|
$(VO_LIBS) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user