RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 17:42:17 +00:00
Code Issues Releases Wiki Activity

--dvbincdir support by Gotz Waschk <waschk@informatik.uni-rostock.de>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10652 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-17 20:56:40 +00:00
parent fe882df796
commit 70848671d3
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,7 +38,7 @@ AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB)
COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) # -Wall
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) # -Wall
PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
ifeq ($(VIDIX),yes)

14
configure vendored
View File

@ -275,11 +275,12 @@ Hazardous options a.k.a. "DO NOT REPORT ANY BUGS!"
--disable-gcc-checking disable gcc version checking [enable]
Use these options if autodetection fails:
--with-extraincdir=DIR extra headers (png, dvb, mad, sdl, css, ...) in DIR
--with-extraincdir=DIR extra headers (png, mad, sdl, css, ...) in DIR
--with-extralibdir=DIR extra library files (png, SDL, ...) in DIR
--with-x11incdir=DIR X headers in DIR
--with-x11libdir=DIR X library files in DIR
--with-dxr2incdir=DIR DXR2 headers in DIR
--with-dvbincdir=DIR DVB headers in DIR
--with-csslibdir=DIR libcss in DIR
--with-madlibdir=DIR libmad (libmad shared library) in DIR
--with-mlibdir=DIR libmlib (MLIB support) in DIR (Solaris only)
@ -1465,6 +1466,9 @@ for ac_option do
--with-xvmclib=*)
_xvmclib=`echo $ac_option | cut -d '=' -f 2`
;;
--with-dvbincdir=*)
_inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
;;
--with-xvidcore=*)
_xvidcore=`echo $ac_option | cut -d '=' -f 2`
;;
@ -3081,7 +3085,7 @@ EOF
_dvb=yes
echores "yes"
else
for I in "-I/usr/src/DVB/ost/include" "$_inc_extra/ost/include" ; do
for I in "$_inc_dvb" "-I/usr/src/DVB/ost/include" ; do
if cc_check "$I" ; then
_dvb=yes
_inc_dvb="$I"
@ -3089,7 +3093,7 @@ EOF
break
fi
done
test "$_dvb" = no && echores "no (specify path to DVB/ost/include with --with-extraincdir=DIR)"
test "$_dvb" = no && echores "no (specify path to DVB/ost/include with --with-dvbincdir=DIR)"
fi
else
echores "no"
@ -3122,7 +3126,7 @@ EOF
_dvbhead=yes
echores "yes"
else
for I in "-I/usr/src/DVB/include" "$_inc_extra/include/linux" ; do
for I in "$_inc_dvb" "-I/usr/src/DVB/include" ; do
if cc_check "$I" ; then
_dvbhead=yes
_inc_dvb="$I"
@ -3130,7 +3134,7 @@ EOF
break
fi
done
test "$_dvbhead" = no && echores "no (specify path to DVB/include (HEAD Version) with --with-extraincdir=DIR)"
test "$_dvbhead" = no && echores "no (specify path to DVB/include (HEAD Version) with --with-dvbincdir=DIR)"
fi
else
echores "no"

2
libmpdemux/Makefile
View File

@ -34,7 +34,7 @@ endif
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC)
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC)
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)
CPLUSPLUS = $(CC)

5
libvo/Makefile
View File

@ -10,7 +10,7 @@ ifeq ($(VIDIX),yes)
SRCS += vosub_vidix.c
endif
CFLAGS = $(OPTFLAGS) -I. -I.. $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall
CFLAGS = $(OPTFLAGS) -I. -I.. $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall
ifeq ($(VIDIX),yes)
CFLAGS += -DVIDIX_PATH='"$(prefix)/lib/mplayer/vidix/"'
endif
@ -26,6 +26,9 @@ endif
$(LIBNAME): $(OBJS)
$(AR) r $(LIBNAME) $(OBJS)
vo_mpegpes.o: vo_mpegpes.c
$(CC) -c $(CFLAGS) $(DVB_INC) -o $@ $<
all: $(LIBNAME)
clean: