Mercurial > mplayer.hg

changeset 1234:dfccdda074e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OPTFLAGS vs. INCLUDES cleanup
author arpi
date Tue, 26 Jun 2001 23:15:58 +0000
parents 554fca022743
children c823cb3a2608
files Makefile configure help_avp.h libao2/Makefile libmpeg2/Makefile libvo/Makefile loader/dshow/Makefile mp3lib/Makefile
diffstat 8 files changed, 19 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jun 26 21:34:03 2001 +0000
+++ b/Makefile	Tue Jun 26 23:15:58 2001 +0000
@@ -18,7 +18,7 @@
 # BINDIR = /usr/local/bin
 SRCS = find_sub.c aviprint.c dll_init.c dec_audio.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
 OBJS = $(SRCS:.c=.o)
-CFLAGS =  -Iloader -Ilibvo $(OPTFLAGS) $(CSS_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
 VO_LIBS = -Llibvo -lvo $(X_LIBS)
 
--- a/configure	Tue Jun 26 21:34:03 2001 +0000
+++ b/configure	Tue Jun 26 23:15:58 2001 +0000
@@ -1095,6 +1095,7 @@
 echo "Checking for mtrr support ... $_mtrr"
 echo "Screen size ... ${_x}x${_y}"
 echo "Checking for X11 libs ... $_x11libdir"
+echo "Checking for X11 headers ... $_x11incdir"
 echo "Checking mga_vid device ... $_mga"
 echo "Checking for xmga ... $_xmga" 
 echo "Checking for SDL ... $_sdl"
@@ -1115,6 +1116,8 @@
 echo "Checking for PNG support ... $_png"
 echo "Checking for DirectShow ... $_dshow"
 echo "Checking for fastmemcpy ... $_fastmemcpy"
+echo "Extra libs : $_extralibdir"
+echo "Extra headers : $_extraincdir"
 # write conf files.
 
 _streamingdef='#undef STREAMING'
@@ -1287,26 +1290,28 @@
 
 # -------- Generated by ./configure -----------
 
+prefix = $_prefix
 AR=ar
 CC=$_cc
+# OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
+OPTFLAGS=$CFLAGS
+EXTRA_INC=$_extraincdir
+WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
+
+X11_INC=$_x11incdir
 X11DIR=$_x11libdir
-# OPTFLAGS=-O4 $_profile $_debug -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
-OPTFLAGS=$CFLAGS $_x11incdir $_extraincdir
-# LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib
-X_LIBS=$_x11libdir $_extralibdir $_gllib $_sdllib $_ggilib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
+X_LIBS=$_x11libdir $_extralibdir $_gllib $_ggilib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib
+
 TERMCAP_LIB=$_libtermcap
 XMM_LIBS = $_xmmplibs
 LIRC_LIBS = $_lirclibs
 CSS_LIB = $_csslib
 CSS_INC = $_cssinc
-SDL_LIB = $_sdllib
 SDL_INC = $_sdlcflags
-WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
 DS_DEP = $_dshowdep
 DS_LIB = $_dshowlib
 ALSA_LIB = $_alsalib
 ESD_LIB = $_esdlib
-prefix = $_prefix
 ARCH_LIBS = $_archlibs
 STREAM_SRCS = $_streamingsrcs
 
--- a/help_avp.h	Tue Jun 26 21:34:03 2001 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-static char* banner_text=
-"\n\n"
-"MPlayer v0.10 [AVI parser]  (C) 2000. Arpad Gereoffy <arpi@esp-team.scene.hu>\n"
-"\n";
-
-static char* help_text=
-"Usage:   aviparse [options] [path/]name\n"
-"\n"
-"  Options:\n"
-//"    -o <driver>     select output driver (see '-o help' for driver list)\n"
-//"    -vcd <track>    play video cd track from device instead of plain file\n"
-//"    -bg             play in background (X11 only!)\n"
-//"    -sb <bytepos>   seek to byte position\n"
-//"    -ss <timepos>   seek to second position (with timestamp)\n"
-//"    -nosound        don't play sound\n"
-//"    -abs <bytes>    audio buffer size (in bytes, default: measuring)\n"
-//"    -delay <secs>   audio delay in seconds (may be +/- float value)\n"
-//"    -alsa           enable timing code (works better with ALSA)\n"
-"    -aid <1-99>     select audio channel\n"
-"    -afile <name>   dump raw audio data to file\n"
-"    -vfile <name>   dump raw video data to file\n"
-//"    -vid <0-15>     select video channel\n"
-//"    -fps <value>    force frame rate (if value is wrong in mpeg header)\n"
-//"    -mc <s/5f>      maximum sync correction per 5 frames (in seconds)\n"
-//"    -afm <1-3>      force audio format  1:MPEG 2:PCM 3:AC3 4:Win32\n"
-//"\n"
-//"  Keys:\n"
-//"    <-  or  ->      seek backward/forward  10 seconds\n"
-//"    up or down      seek backward/forward   1 minute\n"
-//"    p or SPACE      pause movie (press any key to continue)\n"
-//"    q  or  ^C       stop playing and quit program\n"
-"\n";
--- a/libao2/Makefile	Tue Jun 26 21:34:03 2001 +0000
+++ b/libao2/Makefile	Tue Jun 26 23:15:58 2001 +0000
@@ -7,8 +7,7 @@
 SRCS=audio_out.c ao_null.c ao_pcm.c $(OPTIONAL_SRCS)
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(SDL_INC)
-# -I/usr/X11R6/include/
+CFLAGS  = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(EXTRA_INC)
 
 .SUFFIXES: .c .o
 
--- a/libmpeg2/Makefile	Tue Jun 26 21:34:03 2001 +0000
+++ b/libmpeg2/Makefile	Tue Jun 26 23:15:58 2001 +0000
@@ -5,7 +5,7 @@
 
 SRCS	= header.c idct.c idct_mmx.c motion_comp.c motion_comp_mmx.c slice.c stats.c decode.c
 OBJS	= $(SRCS:.c=.o)
-INCLUDE = -I. -I../libvo -I..
+INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY
 
 .SUFFIXES: .c .o
--- a/libvo/Makefile	Tue Jun 26 21:34:03 2001 +0000
+++ b/libvo/Makefile	Tue Jun 26 23:15:58 2001 +0000
@@ -6,7 +6,7 @@
 SRCS=aclib.c osd.c font_load.c rgb15to16mmx.c yuv2rgb_mmx.c yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_odivx.c x11_common.c $(OPTIONAL_SRCS)
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. -DMPG12PLAY $(SDL_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) -DMPG12PLAY
 # -I/usr/X11R6/include/
 
 .SUFFIXES: .c .o
--- a/loader/dshow/Makefile	Tue Jun 26 21:34:03 2001 +0000
+++ b/loader/dshow/Makefile	Tue Jun 26 23:15:58 2001 +0000
@@ -8,8 +8,8 @@
 
 # OBJS	= DS_AudioDec.o DS_VideoDec.o DS_Filter.o allocator.o cmediasample.o guids.o inputpin.o outputpin.o
 
-INCLUDE = -I. -I.. -I../wine
-CFLAGS  = $(INCLUDE) $(OPTFLAGS) -fexceptions 
+INCLUDE = -I. -I.. -I../wine $(EXTRA_INC)
+CFLAGS  = $(OPTFLAGS) $(INCLUDE) -fexceptions 
 
 .SUFFIXES: .cpp .o
 
--- a/mp3lib/Makefile	Tue Jun 26 21:34:03 2001 +0000
+++ b/mp3lib/Makefile	Tue Jun 26 23:15:58 2001 +0000
@@ -4,7 +4,7 @@
 SRCS = sr1.c d_cpu.s decode_i586.s $(OPTIONAL_SRCS)
 OBJS = sr1.o d_cpu.o decode_i586.o $(OPTIONAL_OBJS)
 # OBJS = $(SRCS:.c,.s=.o)
-CFLAGS  = $(OPTFLAGS)
+CFLAGS  = $(OPTFLAGS) $(EXTRA_INC)
 
 .SUFFIXES: .c .o