mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge
This commit is contained in:
commit
d2a4e08ba0
38 changed files with 24 additions and 9868 deletions
|
@ -85,12 +85,6 @@ else
|
|||
srs_undefine_macro "SRS_SIMULATOR" $SRS_AUTO_HEADERS_H
|
||||
fi
|
||||
|
||||
if [ $SRS_GB28181 = YES ]; then
|
||||
srs_define_macro "SRS_GB28181" $SRS_AUTO_HEADERS_H
|
||||
else
|
||||
srs_undefine_macro "SRS_GB28181" $SRS_AUTO_HEADERS_H
|
||||
fi
|
||||
|
||||
if [ $SRS_HTTPS = YES ]; then
|
||||
srs_define_macro "SRS_HTTPS" $SRS_AUTO_HEADERS_H
|
||||
else
|
||||
|
|
|
@ -299,15 +299,6 @@ function OSX_prepare()
|
|||
echo "Please install pkg-config"; exit -1;
|
||||
fi
|
||||
|
||||
if [[ $SRS_GB28181 == YES ]]; then
|
||||
if [[ ! -f /usr/local/opt/libiconv/lib/libiconv.a ]]; then
|
||||
echo "install libiconv"
|
||||
echo "brew install libiconv"
|
||||
brew install libiconv; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
|
||||
echo "install libiconv success"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $SRS_SRT == YES ]]; then
|
||||
echo "SRT enable, install depend tools"
|
||||
tclsh <<< "exit" >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
|
||||
|
|
|
@ -6,7 +6,6 @@ help=no
|
|||
SRS_HDS=NO
|
||||
SRS_SRT=NO
|
||||
SRS_RTC=RESERVED
|
||||
SRS_GB28181=NO
|
||||
SRS_CXX11=YES
|
||||
SRS_CXX14=NO
|
||||
SRS_NGINX=NO
|
||||
|
@ -115,7 +114,6 @@ Features:
|
|||
--utest=on|off Whether build the utest. Default: $(value2switch $SRS_UTEST)
|
||||
--srt=on|off Whether build the SRT. Default: $(value2switch $SRS_SRT)
|
||||
--rtc=on|off Whether build the WebRTC. Default: $(value2switch $SRS_RTC)
|
||||
--gb28181=on|off Whether build the GB28181. Default: $(value2switch $SRS_GB28181)
|
||||
--cxx11=on|off Whether enable the C++11. Default: $(value2switch $SRS_CXX11)
|
||||
--cxx14=on|off Whether enable the C++14. Default: $(value2switch $SRS_CXX14)
|
||||
--ffmpeg-fit=on|off Whether enable the FFmpeg fit(source code). Default: $(value2switch $SRS_FFMPEG_FIT)
|
||||
|
@ -265,10 +263,6 @@ function parse_user_option() {
|
|||
--simulator) SRS_SIMULATOR=$(switch2value $value) ;;
|
||||
--ffmpeg-fit) SRS_FFMPEG_FIT=$(switch2value $value) ;;
|
||||
|
||||
--with-gb28181) SRS_GB28181=YES ;;
|
||||
--without-gb28181) SRS_GB28181=NO ;;
|
||||
--gb28181) SRS_GB28181=$(switch2value $value) ;;
|
||||
|
||||
--cxx11) SRS_CXX11=$(switch2value $value) ;;
|
||||
--cxx14) SRS_CXX14=$(switch2value $value) ;;
|
||||
|
||||
|
@ -356,14 +350,18 @@ function parse_user_option_to_value_and_option() {
|
|||
esac
|
||||
}
|
||||
|
||||
# For variable values, might be three values: YES, RESERVED, NO(by default).
|
||||
function value2switch() {
|
||||
if [[ $1 == YES ]]; then
|
||||
echo on;
|
||||
else if [[ $1 == RESERVED ]]; then
|
||||
echo reserved;
|
||||
else
|
||||
echo off;
|
||||
fi
|
||||
}
|
||||
|
||||
# For user options, only off or on(by default).
|
||||
function switch2value() {
|
||||
if [[ $1 == off ]]; then
|
||||
echo NO;
|
||||
|
@ -473,7 +471,6 @@ function regenerate_options() {
|
|||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srt=$(value2switch $SRS_SRT)"
|
||||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --rtc=$(value2switch $SRS_RTC)"
|
||||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --simulator=$(value2switch $SRS_SIMULATOR)"
|
||||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gb28181=$(value2switch $SRS_GB28181)"
|
||||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cxx11=$(value2switch $SRS_CXX11)"
|
||||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cxx14=$(value2switch $SRS_CXX14)"
|
||||
SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ffmpeg-fit=$(value2switch $SRS_FFMPEG_FIT)"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue