Revision af7a9c24

View differences:

Makefile
35 35

  
36 36
all: $(DIR)
37 37

  
38
simple: Streamers/streamer-grapes$(EXE)
38
simple: Streamers/streamer-udp-grapes$(EXE)
39 39
ml: Streamers/streamer-ml-monl-grapes$(XSTATIC)$(EXE)
40
chunkstream: Streamers/streamer-chunkstream$(EXE) ChunkerPlayer/chunker_player/chunker_player$(EXE)
40
chunkstream: Streamers/streamer-udp-chunkstream$(EXE) ChunkerPlayer/chunker_player/chunker_player$(EXE)
41 41
ml-chunkstream: Streamers/streamer-ml-monl-chunkstream$(XSTATIC)$(EXE) ChunkerPlayer/chunker_player/chunker_player$(EXE)
42 42

  
43 43
$(THIRDPARTYLIBS):
......
73 73
endif
74 74

  
75 75
#.PHONY: Streamers/streamer-grapes Streamers/streamer-ml-monl-grapes$(XSTATIC)$(EXE) Streamers/streamer-chunkstream$(EXE) Streamers/streamer-ml-monl-chunkstream$(XSTATIC)$(EXE)
76
Streamers/streamer-grapes: $(THIRDPARTYLIBS)
76
Streamers/streamer-udp-grapes: $(THIRDPARTYLIBS)
77 77
	cd Streamers && ./configure \
78 78
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags`" --with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs`" \
79 79
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg --with-x264=$(THIRDPARTYLIBS)/x264 \
80
	--with-net-helper=udp \
80 81
	--with-static=$(STATIC)
81 82
	$(MAKE) -C Streamers
82 83

  
......
86 87
	--with-ldflags="`cat $(THIRDPARTYLIBS)/ffmpeg.ldflags`" --with-ldlibs="`cat $(THIRDPARTYLIBS)/ffmpeg.ldlibs`" \
87 88
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg --with-x264=$(THIRDPARTYLIBS)/x264 \
88 89
	--with-napa=$(THIRDPARTYLIBS)/NAPA-BASELIBS/ --with-libevent=$(THIRDPARTYLIBS)/NAPA-BASELIBS/3RDPARTY-LIBS/libevent \
89
	--with-ml --with-monl \
90
	--with-net-helper=ml --with-monl \
90 91
	--with-static=$(STATIC)
91 92
	$(MAKE) -C Streamers
92 93

  
93
Streamers/streamer-chunkstream$(EXE): $(THIRDPARTYLIBS)
94
Streamers/streamer-udp-chunkstream$(EXE): $(THIRDPARTYLIBS)
94 95
	cd Streamers && ./configure \
95 96
	--with-io=chunkstream \
96 97
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg --with-x264=$(THIRDPARTYLIBS)/x264 \
98
	--with-net-helper=udp \
97 99
	--with-static=$(STATIC)
98 100
	$(MAKE) -C Streamers
99 101

  
......
102 104
	--with-io=chunkstream \
103 105
	--with-grapes=$(THIRDPARTYLIBS)/GRAPES --with-ffmpeg=$(THIRDPARTYLIBS)/ffmpeg --with-x264=$(THIRDPARTYLIBS)/x264 \
104 106
	--with-napa=$(THIRDPARTYLIBS)/NAPA-BASELIBS/ --with-libevent=$(THIRDPARTYLIBS)/NAPA-BASELIBS/3RDPARTY-LIBS/libevent \
105
	--with-ml --with-monl \
107
	--with-net-helper=ml --with-monl \
106 108
	--with-static=$(STATIC)
107 109
	$(MAKE) -C Streamers
108 110

  
Streamers
1
Subproject commit 1aef23ec1ba47f56c10d22613a000cba176fea3d
1
Subproject commit d7f6d13668ca8a7c449b298da7997d322b7c2f03

Also available in: Unified diff