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

Merge branch '4.0release' into develop

Browse source
This commit is contained in:
winlin 2020-03-29 17:36:33 +08:00
commit 6935bb18ae
5 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/auto/options.sh
View file

@ -596,10 +596,6 @@ function check_option_conflicts() {
echo "Don't support building FFMPEG, please use docker https://github.com/ossrs/srs-docker"; exit -1;
fi
if [[ $SRS_OSX == YES && $SRS_UTEST == YES ]]; then
echo "Mac does not support utest."; exit -1;
fi
# TODO: FIXME: check more os.
__check_ok=YES