RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Add Makefile variable for DVB OSD menu, saves one ifeq. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26434 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-13 10:44:21 +00:00
parent 65cfce72ec
commit 0cf1308e21
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -98,9 +98,6 @@ SRCS_MPLAYER = mplayer.c \
input/input.c \
SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
ifeq ($(LIBMENU), yes)
SRCS_MPLAYER-$(DVBIN) += libmenu/menu_dvbin.c
endif
SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
gui/bitmap.c \
gui/cfg.c \
@ -150,6 +147,7 @@ SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \
libmenu/menu_txt.c \
libmenu/vf_menu.c \
SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
SRCS_MPLAYER-$(LIRC) += input/lirc.c
OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o

3
configure vendored
View File

@ -7192,8 +7192,10 @@ echores "$_byte_order"
echocheck "OSD menu"
if test "$_menu" = yes ; then
_def_menu='#define HAVE_MENU 1'
test $_dvbin = "yes" && _menu_dvbin=yes
else
_def_menu='#undef HAVE_MENU'
_menu_dvbin=no
fi
echores "$_menu"
@ -7695,6 +7697,7 @@ VIDIX_PCIDB = $_vidix_pcidb_val
CONFIG_POSTPROC = yes
MP3LAME = $_mp3lame
LIBMENU = $_menu
LIBMENU_DVBIN = $_menu_dvbin
MP3LIB = $_mp3lib
LIBA52 = $_liba52