mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
solve merge problem
This commit is contained in:
commit
8d277c6e8b
39 changed files with 411 additions and 434 deletions
14
trunk/configure
vendored
14
trunk/configure
vendored
|
@ -122,16 +122,16 @@ if [[ $SRS_GCOV == YES ]]; then
|
|||
CXXFLAGS="${CXXFLAGS} ${SrsGcov}";
|
||||
fi
|
||||
# User configed options.
|
||||
if [[ $SRS_EXTRA_CFLAGS != '' ]]; then
|
||||
CXXFLAGS="${CXXFLAGS} $SRS_EXTRA_CFLAGS";
|
||||
if [[ $SRS_EXTRA_FLAGS != '' ]]; then
|
||||
CXXFLAGS="${CXXFLAGS} $SRS_EXTRA_FLAGS";
|
||||
fi
|
||||
# Start to generate the Makefile.
|
||||
cat << END >> ${SRS_OBJS}/${SRS_MAKEFILE}
|
||||
GCC = gcc
|
||||
CXX = g++
|
||||
AR = ar
|
||||
GCC = ${SRS_TOOL_CC}
|
||||
CXX = ${SRS_TOOL_CXX}
|
||||
AR = ${SRS_TOOL_AR}
|
||||
ARFLAGS = -rs
|
||||
LINK = g++
|
||||
LINK = ${SRS_TOOL_CXX}
|
||||
CXXFLAGS = ${CXXFLAGS}
|
||||
|
||||
.PHONY: default srs srs_ingest_hls librtmp
|
||||
|
@ -608,7 +608,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
|
|||
echo ""
|
||||
echo "Configure summary:"
|
||||
echo " ${SRS_AUTO_USER_CONFIGURE}"
|
||||
echo " ${SRS_AUTO_CONFIGURE}"
|
||||
echo " ${SRS_AUTO_CONFIGURE}"
|
||||
if [ $SRS_HLS = YES ]; then
|
||||
echo -e "${GREEN}HLS is enabled.${BLACK}"
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue