Mercurial > mplayer.hg
changeset 10651:efb6dcac967d
--dvbincdir support by Gotz Waschk <waschk@informatik.uni-rostock.de>
| author | alex |
|---|---|
| date | Sun, 17 Aug 2003 20:56:40 +0000 |
| parents | 6f51d17ecfc8 |
| children | b04560162c1f |
| files | Makefile configure libmpdemux/Makefile libvo/Makefile |
| diffstat | 4 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Aug 17 20:48:38 2003 +0000 +++ b/Makefile Sun Aug 17 20:56:40 2003 +0000 @@ -38,7 +38,7 @@ 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)
--- a/configure Sun Aug 17 20:48:38 2003 +0000 +++ b/configure Sun Aug 17 20:56:40 2003 +0000 @@ -275,11 +275,12 @@ --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 @@ --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 @@ _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 @@ 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 @@ _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 @@ 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"
--- a/libmpdemux/Makefile Sun Aug 17 20:48:38 2003 +0000 +++ b/libmpdemux/Makefile Sun Aug 17 20:56:40 2003 +0000 @@ -34,7 +34,7 @@ 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)
--- a/libvo/Makefile Sun Aug 17 20:48:38 2003 +0000 +++ b/libvo/Makefile Sun Aug 17 20:56:40 2003 +0000 @@ -10,7 +10,7 @@ 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 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) +vo_mpegpes.o: vo_mpegpes.c + $(CC) -c $(CFLAGS) $(DVB_INC) -o $@ $< + all: $(LIBNAME) clean: