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 configure

Browse source
This commit is contained in:
winlin 2017-03-01 09:21:20 +08:00
parent 68a5407b3a
commit ad87bd7cf2
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/libs.sh
View file

@ -41,7 +41,7 @@ echo -n " @bash auto/generate_header.sh ${SRS_OBJS_DIR}" >> ${FILE}
echo "" >> ${FILE} echo "" >> ${FILE}
# archive librtmp.a # archive librtmp.a
echo -n " \$(AR) -rs ${LIB_TAGET_STATIC} " >> ${FILE} echo -n " \$(AR) \$(ARFLAGS) ${LIB_TAGET_STATIC} " >> ${FILE}
for item in ${MODULE_OBJS[*]}; do for item in ${MODULE_OBJS[*]}; do
FILE_NAME=`basename $item` FILE_NAME=`basename $item`
FILE_NAME=${FILE_NAME%.*} FILE_NAME=${FILE_NAME%.*}

9
trunk/configure vendored
View file

@ -95,17 +95,24 @@ CppStd="-ansi"
if [[ $SRS_EXPORT_LIBRTMP_PROJECT == YES ]]; then if [[ $SRS_EXPORT_LIBRTMP_PROJECT == YES ]]; then
LibraryCompile=" -fPIC" LibraryCompile=" -fPIC"
fi fi
# For MacOS, disable the link warnings:
# srs_librtmp.a(srs_kernel_io.o) unable to open object file: No such file or directory
if [[ $SRS_OSX == YES ]]; then
CxxMacOS=" -D GCC_GENERATE_DEBUGGING_SYMBOLS=no"
fi
# performance of gprof # performance of gprof
SrsGprof=""; SrsGprofLink=""; if [ $SRS_GPROF = YES ]; then SrsGprof=" -pg -lc_p"; SrsGprofLink=" -pg"; fi SrsGprof=""; SrsGprofLink=""; if [ $SRS_GPROF = YES ]; then SrsGprof=" -pg -lc_p"; SrsGprofLink=" -pg"; fi
# performance of gperf # performance of gperf
SrsGperf=""; SrsGperfLink=""; if [ $SRS_GPERF = YES ]; then SrsGperfLink=" -lpthread"; fi SrsGperf=""; SrsGperfLink=""; if [ $SRS_GPERF = YES ]; then SrsGperfLink=" -lpthread"; fi
# the cxx flag generated. # the cxx flag generated.
CXXFLAGS="${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}" CXXFLAGS="${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}${CxxMacOS}"
if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"; fi if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"; fi
# Start to generate the Makefile.
cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
GCC = gcc GCC = gcc
CXX = g++ CXX = g++
AR = ar AR = ar
ARFLAGS = -rs
LINK = g++ LINK = g++
CXXFLAGS = ${CXXFLAGS} CXXFLAGS = ${CXXFLAGS}

2
trunk/src/libs/srs_librtmp.hpp
View file

@ -1230,7 +1230,7 @@ typedef void* srs_hijack_io_t;
/************************************************************* /*************************************************************
************************************************************* *************************************************************
* Deprecated APIs. * Deprecated APIs, maybe removed in future versions.
************************************************************* *************************************************************
*************************************************************/ *************************************************************/
/** /**

9
trunk/src/main/srs_main_server.cpp
View file

@ -341,14 +341,9 @@ void show_macro_features()
srs_warn("srs memory watcher will hurts performance. user should kill by SIGTERM or init.d script."); srs_warn("srs memory watcher will hurts performance. user should kill by SIGTERM or init.d script.");
#endif #endif
#if defined(SRS_AUTO_STREAM_CASTER)
#warning "stream caster is experiment feature."
srs_warn("stream caster is experiment feature.");
#endif
#if VERSION_MAJOR > VERSION_STABLE #if VERSION_MAJOR > VERSION_STABLE
#warning "current branch is not stable, please use stable branch instead." #warning "Current branch is unstable."
srs_warn("SRS %s is not stable, please use stable branch %s instead", RTMP_SIG_SRS_VERSION, VERSION_STABLE_BRANCH); srs_warn("Develop is unstable, please use branch: git checkout %s", VERSION_STABLE_BRANCH);
#endif #endif
#if defined(SRS_PERF_SO_SNDBUF_SIZE) && !defined(SRS_PERF_MW_SO_SNDBUF) #if defined(SRS_PERF_SO_SNDBUF_SIZE) && !defined(SRS_PERF_MW_SO_SNDBUF)