external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine core, move specified functions to kernel utility.

Browse source
This commit is contained in:
winlin 2014-06-08 13:03:03 +08:00
parent 7c7920698d
commit 31b568b013
30 changed files with 224 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/depends.sh
View file

@ -346,7 +346,7 @@ function write_nginx_html5()
END
}
# create the nginx dir, for http-server if not build nginx
rm -rf ${SRS_OBJS}/nginx && mkdir -p ${SRS_OBJS}/nginx
mkdir -p ${SRS_OBJS}/nginx
# make nginx
__SRS_BUILD_NGINX=NO; if [ $SRS_EMBEDED_CPU = NO ]; then if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
if [ $__SRS_BUILD_NGINX = YES ]; then

43
trunk/auto/options.sh
View file

@ -70,6 +70,8 @@ SRS_PURE_RTMP=NO
SRS_RTMP_HLS=NO
# the most fast compile, nothing, only support vp6 RTMP.
SRS_DISABLE_ALL=NO
# all features is on
SRS_ENABLE_ALL=NO
#
# calc
# whether embed cpu, arm/mips
@ -146,6 +148,7 @@ Presets:
--pure-rtmp only support RTMP with ssl.
--rtmp-hls only support RTMP+HLS with ssl.
--disable-all disable all features, only support vp6 RTMP.
--full enable all features.
Conflicts:
1. --with-gmc vs --with-gmp:
@ -229,6 +232,7 @@ function parse_user_option() {
--disable-all) SRS_DISABLE_ALL=YES ;;
--pure-rtmp) SRS_PURE_RTMP=YES ;;
--rtmp-hls) SRS_RTMP_HLS=YES ;;
--full) SRS_ENABLE_ALL=YES ;;
--use-sys-ssl) SRS_USE_SYS_SSL=YES ;;
@ -272,12 +276,14 @@ function apply_user_presets() {
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_MIPS_UBUNTU12 = NO ]; then
if [ $SRS_PI = NO ]; then
if [ $SRS_X86_X64 = NO ]; then
SRS_X86_X64=YES; opt="--x86-x64 $opt";
if [ $SRS_ENABLE_ALL = NO ]; then
if [ $SRS_DEV = NO ]; then
if [ $SRS_ARM_UBUNTU12 = NO ]; then
if [ $SRS_MIPS_UBUNTU12 = NO ]; then
if [ $SRS_PI = NO ]; then
if [ $SRS_X86_X64 = NO ]; then
SRS_X86_X64=YES; opt="--x86-x64 $opt";
fi
fi
fi
fi
@ -321,6 +327,31 @@ function apply_user_presets() {
SRS_STATIC=NO
fi
# all enabled.
if [ $SRS_ENABLE_ALL = YES ]; then
SRS_HLS=YES
SRS_DVR=YES
SRS_NGINX=YES
SRS_SSL=YES
SRS_FFMPEG_TOOL=YES
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_HTTP_API=YES
SRS_LIBRTMP=YES
SRS_BWTC=YES
SRS_RESEARCH=YES
SRS_UTEST=YES
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