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

Fix build fail

Browse source
This commit is contained in:
winlin 2021-06-16 08:43:33 +08:00
parent 68c48e27f5
commit df20fe6c9d
5 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
trunk/auto/options.sh
View file

@ -350,6 +350,7 @@ 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;
@ -358,6 +359,7 @@ function value2switch() {
fi
}
# For user options, only off or on(by default).
function switch2value() {
if [[ $1 == off ]]; then
echo NO;
@ -378,12 +380,7 @@ do
parse_user_option
done
if [ $help = yes ]; then
show_help
exit 0
fi
function apply_detail_options() {
function apply_auto_options() {
# set default preset if not specifies
if [[ $SRS_X86_X64 == NO && $SRS_OSX == NO && $SRS_CROSS_BUILD == NO ]]; then
SRS_X86_X64=YES; opt="--x86-x64 $opt";
@ -410,6 +407,28 @@ function apply_detail_options() {
if [ $SRS_TRANSCODE = YES ]; then SRS_FFMPEG_STUB=YES; fi
if [ $SRS_INGEST = YES ]; then SRS_FFMPEG_STUB=YES; fi
if [[ $SRS_SRTP_ASM == YES && $SRS_RTC == NO ]]; then
echo "Disable SRTP-ASM, because RTC is disabled."
SRS_SRTP_ASM=NO
fi
if [[ $SRS_SRTP_ASM == YES && $SRS_NASM == NO ]]; then
echo "Disable SRTP-ASM, because NASM is disabled."
SRS_SRTP_ASM=NO
fi
}
if [ $help = yes ]; then
apply_auto_options
show_help
exit 0
fi
#####################################################################################
# apply options
#####################################################################################
function apply_detail_options() {
# Always enable HTTP utilies.
if [ $SRS_HTTP_CORE = NO ]; then SRS_HTTP_CORE=YES; echo -e "${YELLOW}[WARN] Always enable HTTP utilies.${BLACK}"; fi
if [ $SRS_STREAM_CASTER = NO ]; then SRS_STREAM_CASTER=YES; echo -e "${YELLOW}[WARN] Always enable StreamCaster.${BLACK}"; fi
@ -429,17 +448,8 @@ function apply_detail_options() {
else
export SRS_JOBS="--jobs=${SRS_JOBS}"
fi
if [[ $SRS_SRTP_ASM == YES && $SRS_RTC == NO ]]; then
echo "Disable SRTP-ASM, because RTC is disabled."
SRS_SRTP_ASM=NO
fi
if [[ $SRS_SRTP_ASM == YES && $SRS_NASM == NO ]]; then
echo "Disable SRTP-ASM, because NASM is disabled."
SRS_SRTP_ASM=NO
fi
}
apply_auto_options
apply_detail_options
function regenerate_options() {

1
trunk/src/app/srs_app_listener.cpp
View file

@ -25,6 +25,7 @@ using namespace std;
#include <srs_app_utility.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_buffer.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_protocol_kbps.hpp>

3
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -16,6 +16,7 @@ using namespace std;
#include <fcntl.h>
#include <unistd.h>
#include <queue>
#include <sstream>
#include <srs_core_autofree.hpp>
@ -41,6 +42,8 @@ using namespace std;
#include <srs_app_rtc_source.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_app_threads.hpp>
#include <srs_service_log.hpp>
#include <srs_app_log.hpp>
#include <srs_protocol_kbps.hpp>

1
trunk/src/app/srs_app_rtc_server.cpp
View file

@ -27,6 +27,7 @@ using namespace std;
#include <srs_app_rtc_source.hpp>
#include <srs_app_rtc_api.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_service_log.hpp>
extern SrsPps* _srs_pps_rpkts;
SrsPps* _srs_pps_rstuns = NULL;

1
trunk/src/app/srs_app_server.cpp
View file

@ -35,6 +35,7 @@ using namespace std;
#include <srs_app_caster_flv.hpp>
#include <srs_kernel_consts.hpp>
#include <srs_app_coworkers.hpp>
#include <srs_service_log.hpp>
std::string srs_listener_type2string(SrsListenerType type)
{