正在显示
1 个修改的文件
包含
2 行增加
和
1 行删除
| @@ -217,7 +217,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then | @@ -217,7 +217,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then | ||
| 217 | fi | 217 | fi |
| 218 | else | 218 | else |
| 219 | # arm not specified, if exists flag, need to rebuild for no-arm platform. | 219 | # arm not specified, if exists flag, need to rebuild for no-arm platform. |
| 220 | - if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st-1.9/obj/libst.a && -f ${SRS_OBJS}/st-1.9/obj/libst.so ]]; then | 220 | + if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st-1.9/obj/libst.a && -f ${SRS_OBJS}/st-1.9/obj/libst.so ]]; then |
| 221 | echo "st-1.9t is ok."; | 221 | echo "st-1.9t is ok."; |
| 222 | else | 222 | else |
| 223 | echo "build st-1.9t"; | 223 | echo "build st-1.9t"; |
| @@ -271,6 +271,7 @@ function write_nginx_html5() | @@ -271,6 +271,7 @@ function write_nginx_html5() | ||
| 271 | </video> | 271 | </video> |
| 272 | END | 272 | END |
| 273 | } | 273 | } |
| 274 | +__SRS_BUILD_NGINX=NO; if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then __SRS_BUILD_NGINX=YES; fi fi | ||
| 274 | if [ $SRS_ARM_UBUNTU12 = NO ]; then | 275 | if [ $SRS_ARM_UBUNTU12 = NO ]; then |
| 275 | if [ $SRS_HLS = YES ]; then | 276 | if [ $SRS_HLS = YES ]; then |
| 276 | if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then | 277 | if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then |
-
请 注册 或 登录 后发表评论