胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
fc347a1c 1 parent f03fde37

update configure, remove the bwtc, moved to research now.

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 5 行删除
@@ -71,7 +71,7 @@ SRS_ARM_UBUNTU12=NO @@ -71,7 +71,7 @@ SRS_ARM_UBUNTU12=NO
71 SRS_MIPS_UBUNTU12=NO 71 SRS_MIPS_UBUNTU12=NO
72 # dev, open all features for dev, no gperf/prof/arm. 72 # dev, open all features for dev, no gperf/prof/arm.
73 SRS_DEV=NO 73 SRS_DEV=NO
74 -# dev, open main server feature for dev, no bwtc/utest/research/librtmp 74 +# dev, open main server feature for dev, no utest/research/librtmp
75 SRS_FAST_DEV=NO 75 SRS_FAST_DEV=NO
76 # demo, for the demo of srs, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo 76 # demo, for the demo of srs, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo
77 SRS_DEMO=NO 77 SRS_DEMO=NO
@@ -121,7 +121,6 @@ Options: @@ -121,7 +121,6 @@ Options:
121 user must specifies the ingest tools in conf. 121 user must specifies the ingest tools in conf.
122 --with-stat enable the data statistic, for http api. 122 --with-stat enable the data statistic, for http api.
123 --with-librtmp enable srs-librtmp, library for client. 123 --with-librtmp enable srs-librtmp, library for client.
124 - --with-bwtc enable SRS bandwidth test client tool.  
125 --with-research build the research tools. 124 --with-research build the research tools.
126 --with-utest build the utest for SRS. 125 --with-utest build the utest for SRS.
127 --with-gperf build SRS with gperf tools(no gmc/gmp/gcp, with tcmalloc only). 126 --with-gperf build SRS with gperf tools(no gmc/gmp/gcp, with tcmalloc only).
@@ -143,7 +142,6 @@ Options: @@ -143,7 +142,6 @@ Options:
143 --without-ingest disable the ingest feature. 142 --without-ingest disable the ingest feature.
144 --without-stat disable the data statistic feature. 143 --without-stat disable the data statistic feature.
145 --without-librtmp disable srs-librtmp, library for client. 144 --without-librtmp disable srs-librtmp, library for client.
146 - --without-bwtc disable SRS bandwidth test client tool.  
147 --without-research do not build the research tools. 145 --without-research do not build the research tools.
148 --without-utest do not build the utest for SRS. 146 --without-utest do not build the utest for SRS.
149 --without-gperf do not build SRS with gperf tools(without tcmalloc and gmc/gmp/gcp). 147 --without-gperf do not build SRS with gperf tools(without tcmalloc and gmc/gmp/gcp).
@@ -173,7 +171,7 @@ Presets: @@ -173,7 +171,7 @@ Presets:
173 --rtmp-hls only support RTMP+HLS with ssl. 171 --rtmp-hls only support RTMP+HLS with ssl.
174 --disable-all disable all features, only support vp6 RTMP. 172 --disable-all disable all features, only support vp6 RTMP.
175 --dev for dev, open all features, no nginx/gperf/gprof/arm. 173 --dev for dev, open all features, no nginx/gperf/gprof/arm.
176 - --fast-dev for dev fast compile, the RTMP server, without bwtc/librtmp/utest/research. 174 + --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research.
177 --demo for srs demo, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo 175 --demo for srs demo, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo
178 --full enable all features, no gperf/gprof/arm. 176 --full enable all features, no gperf/gprof/arm.
179 177
@@ -182,7 +180,7 @@ Conflicts: @@ -182,7 +180,7 @@ Conflicts:
182 @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html 180 @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html
183 2. --with-gperf/gmc/gmp vs --with-gprof: 181 2. --with-gperf/gmc/gmp vs --with-gprof:
184 gperftools not compatible with gprof. 182 gperftools not compatible with gprof.
185 - 3. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof: 183 + 3. --arm vs --with-ffmpeg/gperf/gmc/gmp/gprof:
186 the complex tools not available for arm. 184 the complex tools not available for arm.
187 185
188 Experts: 186 Experts: