Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-18 15:13:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d013801c268f0269ff6b6ba4e9d434191adc3fce
d013801c
1 parent
6b76e9e6
add configure options --disable-all
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
37 行增加
和
0 行删除
trunk/auto/options.sh
trunk/scripts/test_configure.sh
trunk/auto/options.sh
查看文件 @
d013801
...
...
@@ -66,6 +66,8 @@ SRS_FAST=NO
SRS_PURE_RTMP
=
NO
# only support RTMP+HLS with ssl.
SRS_RTMP_HLS
=
NO
# the most fast compile, nothing, only support vp6 RTMP.
SRS_DISABLE_ALL
=
NO
#####################################################################################
# menu
...
...
@@ -136,6 +138,7 @@ Presets:
--fast the most fast compile, nothing, only support vp6 RTMP.
--pure-rtmp only support RTMP with ssl.
--rtmp-hls only support RTMP+HLS with ssl.
--disable-all disable all features, only support vp6 RTMP.
Conflicts:
1. --dev/x86-x64 vs --static:
...
...
@@ -215,6 +218,7 @@ function parse_user_option() {
--pi
)
SRS_PI
=
YES
;;
--dev
)
SRS_DEV
=
YES
;;
--fast
)
SRS_FAST
=
YES
;;
--disable-all
)
SRS_DISABLE_ALL
=
YES
;;
--pure-rtmp
)
SRS_PURE_RTMP
=
YES
;;
--rtmp-hls
)
SRS_RTMP_HLS
=
YES
;;
...
...
@@ -259,6 +263,7 @@ function apply_user_presets() {
if
[
$SRS_RTMP_HLS
=
NO
]
;
then
if
[
$SRS_PURE_RTMP
=
NO
]
;
then
if
[
$SRS_FAST
=
NO
]
;
then
if
[
$SRS_DISABLE_ALL
=
NO
]
;
then
if
[
$SRS_DEV
=
NO
]
;
then
if
[
$SRS_ARM_UBUNTU12
=
NO
]
;
then
if
[
$SRS_PI
=
NO
]
;
then
...
...
@@ -271,8 +276,34 @@ function apply_user_presets() {
fi
fi
fi
fi
# all disabled.
if
[
$SRS_DISABLE_ALL
=
YES
]
;
then
SRS_HLS
=
NO
SRS_DVR
=
NO
SRS_NGINX
=
NO
SRS_SSL
=
NO
SRS_FFMPEG_TOOL
=
NO
SRS_TRANSCODE
=
NO
SRS_INGEST
=
NO
SRS_HTTP_PARSER
=
NO
SRS_HTTP_CALLBACK
=
NO
SRS_HTTP_SERVER
=
NO
SRS_HTTP_API
=
NO
SRS_LIBRTMP
=
NO
SRS_BWTC
=
NO
SRS_RESEARCH
=
NO
SRS_UTEST
=
NO
SRS_GPERF
=
NO
SRS_GPERF_MC
=
NO
SRS_GPERF_MP
=
NO
SRS_GPERF_CP
=
NO
SRS_GPROF
=
NO
SRS_STATIC
=
NO
fi
# only rtmp vp6
if
[
$SRS_FAST
=
YES
]
;
then
SRS_HLS
=
NO
SRS_DVR
=
NO
...
...
trunk/scripts/test_configure.sh
查看文件 @
d013801
...
...
@@ -29,6 +29,12 @@ ok_msg "test \" ${item} \""
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
failed_msg
"test
\"
${
item
}
\"
failed. ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"test
\"
${
item
}
\"
success"
item
=
"./configure --disable-all"
ok_msg
"test
\"
${
item
}
\"
"
(
./configure --disable-all
&&
make
)
>>
$log
2>&1
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
failed_msg
"test
\"
${
item
}
\"
failed. ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"test
\"
${
item
}
\"
success"
item
=
"./configure --fast"
ok_msg
"test
\"
${
item
}
\"
"
(
./configure --fast
&&
make
)
>>
$log
2>&1
...
...
请
注册
或
登录
后发表评论