胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
ba418bdb 2 parents c4dacdb7 92665084

Merge branch 'srs.master'

内嵌 并排对比
正在显示 8 个修改的文件 包含 115 行增加 和 76 行删除
@@ -228,6 +228,7 @@ Supported operating systems and hardware: @@ -228,6 +228,7 @@ Supported operating systems and hardware:
228 * 2013-10-17, Created.<br/> 228 * 2013-10-17, Created.<br/>
229 229
230 ## History 230 ## History
  231 +* v2.0, 2014-11-08, fix [#191](https://github.com/winlinvip/simple-rtmp-server/issues/191), configure --export-librtmp. 2.0.10.
231 * v2.0, 2014-11-08, fix [#66](https://github.com/winlinvip/simple-rtmp-server/issues/66), srs-librtmp support write h264 raw packet. 2.0.9. 232 * v2.0, 2014-11-08, fix [#66](https://github.com/winlinvip/simple-rtmp-server/issues/66), srs-librtmp support write h264 raw packet. 2.0.9.
232 * v2.0, 2014-10-25, fix [#185](https://github.com/winlinvip/simple-rtmp-server/issues/185), AMF0 support 0x0B the date type codec. 2.0.7. 233 * v2.0, 2014-10-25, fix [#185](https://github.com/winlinvip/simple-rtmp-server/issues/185), AMF0 support 0x0B the date type codec. 2.0.7.
233 * v2.0, 2014-10-24, fix [#186](https://github.com/winlinvip/simple-rtmp-server/issues/186), hotfix for bug #186, drop connect args when not object. 2.0.6. 234 * v2.0, 2014-10-24, fix [#186](https://github.com/winlinvip/simple-rtmp-server/issues/186), hotfix for bug #186, drop connect args when not object. 2.0.6.
@@ -125,7 +125,10 @@ function Ubuntu_prepare() @@ -125,7 +125,10 @@ function Ubuntu_prepare()
125 echo "Ubuntu install tools success" 125 echo "Ubuntu install tools success"
126 return 0 126 return 0
127 } 127 }
128 -Ubuntu_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Ubuntu prepare failed, ret=$ret"; exit $ret; fi 128 +# donot prepare tools, for srs-librtmp depends only gcc and g++.
  129 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  130 + Ubuntu_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Ubuntu prepare failed, ret=$ret"; exit $ret; fi
  131 +fi
129 ##################################################################################### 132 #####################################################################################
130 # for Centos, auto install tools by yum 133 # for Centos, auto install tools by yum
131 ##################################################################################### 134 #####################################################################################
@@ -213,50 +216,55 @@ function Centos_prepare() @@ -213,50 +216,55 @@ function Centos_prepare()
213 echo "Centos install tools success" 216 echo "Centos install tools success"
214 return 0 217 return 0
215 } 218 }
216 -Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "CentOS prepare failed, ret=$ret"; exit $ret; fi 219 +# donot prepare tools, for srs-librtmp depends only gcc and g++.
  220 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  221 + Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "CentOS prepare failed, ret=$ret"; exit $ret; fi
  222 +fi
217 223
218 ##################################################################################### 224 #####################################################################################
219 # st-1.9 225 # st-1.9
220 ##################################################################################### 226 #####################################################################################
221 -# check the arm flag file, if flag changed, need to rebuild the st.  
222 -_ST_MAKE=linux-debug  
223 -if [ $SRS_EMBEDED_CPU = YES ]; then  
224 - # ok, arm specified, if the flag filed does not exists, need to rebuild.  
225 - if [[ -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then  
226 - echo "st-1.9t for arm is ok.";  
227 - else  
228 - # TODO: FIXME: patch the bug.  
229 - # patch st for arm, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix  
230 - echo "build st-1.9t for arm";  
231 - (  
232 - rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&  
233 - unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&  
234 - patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&  
235 - make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} EXTRA_CFLAGS="-DMD_HAVE_EPOLL" ${_ST_MAKE} &&  
236 - cd .. && rm -rf st && ln -sf st-1.9/obj st &&  
237 - cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp  
238 - )  
239 - fi  
240 -else  
241 - if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then  
242 - echo "st-1.9t is ok."; 227 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  228 + # check the arm flag file, if flag changed, need to rebuild the st.
  229 + _ST_MAKE=linux-debug
  230 + if [ $SRS_EMBEDED_CPU = YES ]; then
  231 + # ok, arm specified, if the flag filed does not exists, need to rebuild.
  232 + if [[ -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
  233 + echo "st-1.9t for arm is ok.";
  234 + else
  235 + # TODO: FIXME: patch the bug.
  236 + # patch st for arm, @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix
  237 + echo "build st-1.9t for arm";
  238 + (
  239 + rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
  240 + unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
  241 + patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&
  242 + make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} EXTRA_CFLAGS="-DMD_HAVE_EPOLL" ${_ST_MAKE} &&
  243 + cd .. && rm -rf st && ln -sf st-1.9/obj st &&
  244 + cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp
  245 + )
  246 + fi
243 else 247 else
244 - echo "build st-1.9t";  
245 - (  
246 - rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&  
247 - unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&  
248 - echo "we alaways patch the st, for we may build srs under arm directly" &&  
249 - echo "the 1.st.arm.patch is ok for x86 because it's only modify code under macro linux arm" &&  
250 - patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&  
251 - make ${_ST_MAKE} &&  
252 - cd .. && rm -rf st && ln -sf st-1.9/obj st &&  
253 - cd .. && rm -f ${SRS_OBJS}/_flag.st.arm.tmp  
254 - ) 248 + if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
  249 + echo "st-1.9t is ok.";
  250 + else
  251 + echo "build st-1.9t";
  252 + (
  253 + rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
  254 + unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
  255 + echo "we alaways patch the st, for we may build srs under arm directly" &&
  256 + echo "the 1.st.arm.patch is ok for x86 because it's only modify code under macro linux arm" &&
  257 + patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&
  258 + make ${_ST_MAKE} &&
  259 + cd .. && rm -rf st && ln -sf st-1.9/obj st &&
  260 + cd .. && rm -f ${SRS_OBJS}/_flag.st.arm.tmp
  261 + )
  262 + fi
255 fi 263 fi
  264 + # check status
  265 + ret=$?; if [[ $ret -ne 0 ]]; then echo "build st-1.9 failed, ret=$ret"; exit $ret; fi
  266 + if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "build st-1.9 static lib failed."; exit -1; fi
256 fi 267 fi
257 -# check status  
258 -ret=$?; if [[ $ret -ne 0 ]]; then echo "build st-1.9 failed, ret=$ret"; exit $ret; fi  
259 -if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "build st-1.9 static lib failed."; exit -1; fi  
260 268
261 ##################################################################################### 269 #####################################################################################
262 # http-parser-2.1 270 # http-parser-2.1
@@ -335,7 +343,9 @@ function write_nginx_html5() @@ -335,7 +343,9 @@ function write_nginx_html5()
335 END 343 END
336 } 344 }
337 # create the nginx dir, for http-server if not build nginx 345 # create the nginx dir, for http-server if not build nginx
338 -mkdir -p ${SRS_OBJS}/nginx 346 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  347 + mkdir -p ${SRS_OBJS}/nginx
  348 +fi
339 # make nginx 349 # make nginx
340 __SRS_BUILD_NGINX=NO; if [ $SRS_EMBEDED_CPU = NO ]; then if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi fi 350 __SRS_BUILD_NGINX=NO; if [ $SRS_EMBEDED_CPU = NO ]; then if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
341 if [ $__SRS_BUILD_NGINX = YES ]; then 351 if [ $__SRS_BUILD_NGINX = YES ]; then
@@ -361,31 +371,34 @@ if [ $__SRS_BUILD_NGINX = YES ]; then @@ -361,31 +371,34 @@ if [ $__SRS_BUILD_NGINX = YES ]; then
361 sed -i "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf 371 sed -i "s/^.user nobody;/user `whoami`;/g" ${SRS_OBJS}/nginx/conf/nginx.conf
362 fi 372 fi
363 373
364 -# create forward dir  
365 -mkdir -p ${SRS_OBJS}/nginx/html/live &&  
366 -mkdir -p ${SRS_OBJS}/nginx/html/forward/live  
367 -  
368 -# generate default html pages for android.  
369 -html_file=${SRS_OBJS}/nginx/html/live/demo.html && hls_stream=demo.m3u8 && write_nginx_html5  
370 -html_file=${SRS_OBJS}/nginx/html/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5  
371 -html_file=${SRS_OBJS}/nginx/html/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5  
372 -html_file=${SRS_OBJS}/nginx/html/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5  
373 -html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5  
374 -html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5  
375 -html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5  
376 -  
377 -# copy players to nginx html dir.  
378 -rm -rf ${SRS_OBJS}/nginx/html/players &&  
379 -ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players &&  
380 -rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&  
381 -ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml  
382 -  
383 -# for favicon.ico  
384 -rm -rf ${SRS_OBJS}/nginx/html/favicon.ico &&  
385 -ln -sf `pwd`/research/api-server/static-dir/favicon.ico ${SRS_OBJS}/nginx/html/favicon.ico  
386 -  
387 -# nginx.html to detect whether nginx is alive  
388 -echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html 374 +# the demo dir.
  375 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  376 + # create forward dir
  377 + mkdir -p ${SRS_OBJS}/nginx/html/live &&
  378 + mkdir -p ${SRS_OBJS}/nginx/html/forward/live
  379 +
  380 + # generate default html pages for android.
  381 + html_file=${SRS_OBJS}/nginx/html/live/demo.html && hls_stream=demo.m3u8 && write_nginx_html5
  382 + html_file=${SRS_OBJS}/nginx/html/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5
  383 + html_file=${SRS_OBJS}/nginx/html/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5
  384 + html_file=${SRS_OBJS}/nginx/html/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5
  385 + html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5
  386 + html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5
  387 + html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5
  388 +
  389 + # copy players to nginx html dir.
  390 + rm -rf ${SRS_OBJS}/nginx/html/players &&
  391 + ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players &&
  392 + rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&
  393 + ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml
  394 +
  395 + # for favicon.ico
  396 + rm -rf ${SRS_OBJS}/nginx/html/favicon.ico &&
  397 + ln -sf `pwd`/research/api-server/static-dir/favicon.ico ${SRS_OBJS}/nginx/html/favicon.ico
  398 +
  399 + # nginx.html to detect whether nginx is alive
  400 + echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html
  401 +fi
389 402
390 if [ $SRS_NGINX = YES ]; then 403 if [ $SRS_NGINX = YES ]; then
391 echo "#define SRS_AUTO_NGINX" >> $SRS_AUTO_HEADERS_H 404 echo "#define SRS_AUTO_NGINX" >> $SRS_AUTO_HEADERS_H
@@ -57,7 +57,7 @@ done @@ -57,7 +57,7 @@ done
57 echo "" >> ${FILE} 57 echo "" >> ${FILE}
58 58
59 # parent Makefile, to create module output dir before compile it. 59 # parent Makefile, to create module output dir before compile it.
60 -echo " mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_MAKEFILE}  
61 -echo " mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_MAKEFILE} 60 +echo " mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
  61 +echo " mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
62 62
63 echo -n "generate lib ${LIB_NAME} ok"; echo '!'; 63 echo -n "generate lib ${LIB_NAME} ok"; echo '!';
@@ -85,6 +85,6 @@ done @@ -85,6 +85,6 @@ done
85 echo "" >> ${FILE} 85 echo "" >> ${FILE}
86 86
87 # parent Makefile, to create module output dir before compile it. 87 # parent Makefile, to create module output dir before compile it.
88 -echo " mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_MAKEFILE} 88 +echo " mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
89 89
90 echo -n "generate module ${MODULE_ID} ok"; echo '!'; 90 echo -n "generate module ${MODULE_ID} ok"; echo '!';
@@ -20,7 +20,9 @@ SrsGperfMCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MC = YES ]; then @@ -20,7 +20,9 @@ SrsGperfMCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MC = YES ]; then
20 SrsGperfMPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MP = YES ]; then SrsGperfMPSummaryColor="\${YELLOW}"; fi 20 SrsGperfMPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MP = YES ]; then SrsGperfMPSummaryColor="\${YELLOW}"; fi
21 SrsGperfCPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_CP = YES ]; then SrsGperfCPSummaryColor="\${YELLOW}"; fi 21 SrsGperfCPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_CP = YES ]; then SrsGperfCPSummaryColor="\${YELLOW}"; fi
22 SrsGprofSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPROF = YES ]; then SrsGprofSummaryColor="\${YELLOW}"; fi 22 SrsGprofSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPROF = YES ]; then SrsGprofSummaryColor="\${YELLOW}"; fi
23 -cat <<END > ${SRS_OBJS}/${SRS_BUILD_SUMMARY} 23 +
  24 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  25 + cat <<END > ${SRS_OBJS}/${SRS_BUILD_SUMMARY}
24 #!/bin/bash 26 #!/bin/bash
25 27
26 ##################################################################################### 28 #####################################################################################
@@ -94,7 +96,26 @@ echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manag @@ -94,7 +96,26 @@ echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manag
94 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" 96 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
95 echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build\${BLACK}" 97 echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build\${BLACK}"
96 98
97 -echo "you can:" 99 +echo "You can:"
98 echo " ./objs/srs -c conf/srs.conf" 100 echo " ./objs/srs -c conf/srs.conf"
99 echo " to start the srs server, with config conf/srs.conf." 101 echo " to start the srs server, with config conf/srs.conf."
100 END 102 END
  103 +else
  104 + cat <<END > ${SRS_OBJS}/${SRS_BUILD_SUMMARY}
  105 +#!/bin/bash
  106 +
  107 +#####################################################################################
  108 +# linux shell color support.
  109 +RED="\\${RED}"
  110 +GREEN="\\${GREEN}"
  111 +YELLOW="\\${YELLOW}"
  112 +BLACK="\\${BLACK}"
  113 +
  114 +echo -e "\${BLACK}You can use srs-librtmp at:\${BLACK}"
  115 +echo -e "\${GREEN} objs/include/srs_librtmp.h\${BLACK}"
  116 +echo -e "\${GREEN} objs/lib/srs_librtmp.a\${BLACK}"
  117 +echo -e "\${BLACK}Examples for srs-librtmp at:\${BLACK}"
  118 +echo -e "\${GREEN} objs/research/librtmp\${BLACK}"
  119 +echo -e "\${GREEN} Examples: https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}"
  120 +END
  121 +fi
@@ -176,6 +176,6 @@ END @@ -176,6 +176,6 @@ END
176 176
177 ##################################################################################### 177 #####################################################################################
178 # parent Makefile, to create module output dir before compile it. 178 # parent Makefile, to create module output dir before compile it.
179 -echo " mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_MAKEFILE} 179 +echo " mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
180 180
181 echo -n "generate utest ok"; echo '!'; 181 echo -n "generate utest ok"; echo '!';
@@ -33,10 +33,12 @@ if [ $SRS_EXPORT_LIBRTMP != NO ]; then @@ -33,10 +33,12 @@ if [ $SRS_EXPORT_LIBRTMP != NO ]; then
33 # create target 33 # create target
34 SRS_WORKDIR=${SRS_EXPORT_LIBRTMP} && SRS_OBJS=${SRS_WORKDIR}/${SRS_OBJS_DIR} && mkdir -p ${SRS_OBJS} && 34 SRS_WORKDIR=${SRS_EXPORT_LIBRTMP} && SRS_OBJS=${SRS_WORKDIR}/${SRS_OBJS_DIR} && mkdir -p ${SRS_OBJS} &&
35 # copy src to target 35 # copy src to target
36 - _CPT=${SRS_EXPORT_LIBRTMP}/3rdparty && mkdir -p ${_CPT} && cp 3rdparty/st-1.9.zip ${_CPT} &&  
37 - _CPT=${SRS_EXPORT_LIBRTMP}/3rdparty/patches && mkdir -p ${_CPT} && cp 3rdparty/patches/1.st.arm.patch ${_CPT} &&  
38 - _CPT=${SRS_EXPORT_LIBRTMP}/research/librtmp && mkdir -p ${_CPT} && cp research/librtmp/*.c ${_CPT} && cp research/librtmp/Makefile ${_CPT} &&  
39 - _CPT=${SRS_EXPORT_LIBRTMP}/src/core && mkdir -p ${_CPT} && cp src/core/* ${_CPT} 36 + _CPT=${SRS_EXPORT_LIBRTMP}/research/librtmp && mkdir -p ${_CPT} && cp research/librtmp/*.c research/librtmp/Makefile ${_CPT} &&
  37 + _CPT=${SRS_EXPORT_LIBRTMP}/auto && mkdir -p ${_CPT} && cp auto/generate_header.sh ${_CPT} &&
  38 + _CPT=${SRS_EXPORT_LIBRTMP}/src/core && mkdir -p ${_CPT} && cp src/core/* ${_CPT} &&
  39 + _CPT=${SRS_EXPORT_LIBRTMP}/src/kernel && mkdir -p ${_CPT} && cp src/kernel/* ${_CPT} &&
  40 + _CPT=${SRS_EXPORT_LIBRTMP}/src/rtmp && mkdir -p ${_CPT} && cp src/rtmp/* ${_CPT} &&
  41 + _CPT=${SRS_EXPORT_LIBRTMP}/src/libs && mkdir -p ${_CPT} && cp src/libs/* ${_CPT}
40 # check ret 42 # check ret
41 ret=$?; if [[ $ret -ne 0 ]]; then echo "export src failed, ret=$ret"; exit $ret; fi 43 ret=$?; if [[ $ret -ne 0 ]]; then echo "export src failed, ret=$ret"; exit $ret; fi
42 fi 44 fi
@@ -468,7 +470,9 @@ echo 'configure ok! ' @@ -468,7 +470,9 @@ echo 'configure ok! '
468 # when configure success, prepare build 470 # when configure success, prepare build
469 ##################################################################################### 471 #####################################################################################
470 # create objs/logs for ffmpeg to write log. 472 # create objs/logs for ffmpeg to write log.
471 -mkdir -p ${SRS_OBJS}/logs 473 +if [ $SRS_EXPORT_LIBRTMP = NO ]; then
  474 + mkdir -p ${SRS_OBJS}/logs
  475 +fi
472 476
473 ##################################################################################### 477 #####################################################################################
474 # configure summary 478 # configure summary
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 9 34 +#define VERSION_REVISION 10
35 // server info. 35 // server info.
36 #define RTMP_SIG_SRS_KEY "SRS" 36 #define RTMP_SIG_SRS_KEY "SRS"
37 #define RTMP_SIG_SRS_ROLE "origin/edge server" 37 #define RTMP_SIG_SRS_ROLE "origin/edge server"