diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 00:39:07 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-05 00:39:07 +0000 |
| commit | fa788640e26698f98070cc01be09dc5071580881 (patch) | |
| tree | 3963d1dd69d48ad440e02251286001d90f5fbb01 /libmpdemux/Makefile | |
| parent | 11bc29e6cc3aaa2a70562f1142609d2800e2f6b9 (diff) | |
| download | mpv-fa788640e26698f98070cc01be09dc5071580881.tar.bz2 mpv-fa788640e26698f98070cc01be09dc5071580881.tar.xz | |
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
see <http://www.live.com/mplayer/> for details.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/Makefile')
| -rw-r--r-- | libmpdemux/Makefile | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 01fc669b90..b2cb029c1a 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -5,14 +5,26 @@ include ../config.mak SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c ifeq ($(STREAMING),yes) -SRCS += asf_streaming.c url.c http.c network.c rtp.c asf_mmst_streaming.c +SRCS += asf_streaming.c url.c http.c network.c asf_mmst_streaming.c +ifeq ($(STREAMING_LIVE_DOT_COM),yes) +CPLUSPLUSSRCS = demux_rtp.cpp +CPLUSPLUSINCLUDE = -I$(LIVE_LIB_DIR)/liveMedia/include +CPLUSPLUSINCLUDE += -I$(LIVE_LIB_DIR)/UsageEnvironment/include +CPLUSPLUSINCLUDE += -I$(LIVE_LIB_DIR)/BasicUsageEnvironment/include +CPLUSPLUSINCLUDE += -I$(LIVE_LIB_DIR)/groupsock/include +else +SRCS += rtp.c +endif endif OBJS = $(SRCS:.c=.o) +OBJS += $(CPLUSPLUSSRCS:.cpp=.o) INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) CFLAGS = $(OPTFLAGS) $(INCLUDE) +CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) +CPLUSPLUS = c++ -.SUFFIXES: .c .o +.SUFFIXES: .c .cpp .o # .PHONY: all clean @@ -20,6 +32,8 @@ all: $(LIBNAME) .c.o: $(CC) -c $(CFLAGS) -o $@ $< +.cpp.o: + $(CPLUSPLUS) -c $(CPLUSPLUSFLAGS) -o $@ $< $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) |