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 bug of openssl, use objs/openssl/include

Browse source
This commit is contained in:
winlin 2014-02-28 22:50:18 +08:00
parent a6f4815994
commit 7fa031e7fb
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
trunk/configure vendored
View file

@ -102,10 +102,19 @@ END
LibSTRoot="${SRS_OBJS}/st" LibSTRoot="${SRS_OBJS}/st"
LibSTfile="${LibSTRoot}/libst.a" LibSTfile="${LibSTRoot}/libst.a"
# hp(http-parser) the http request/url parser, for SRS to support HTTP callback. # hp(http-parser) the http request/url parser, for SRS to support HTTP callback.
LibHttpParserRoot=""
LibHttpParserfile=""
if [ $SRS_HTTP = YES ]; then if [ $SRS_HTTP = YES ]; then
LibHttpParserRoot="${SRS_OBJS}/hp" LibHttpParserRoot="${SRS_OBJS}/hp"
LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a" LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"
fi fi
# openssl-1.0.1f, for the RTMP complex handshake.
LibSSLRoot=""
LibSSLfile=""
if [ $SRS_SSL = YES ]; then
LibSSLRoot="${SRS_OBJS}/openssl/include"
LibSSLfile="${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"
fi
##################################################################################### #####################################################################################
# Modules, compile each module, then link to binary # Modules, compile each module, then link to binary
@ -113,10 +122,7 @@ fi
#Core Module #Core Module
MODULE_ID="CORE" MODULE_ID="CORE"
MODULE_DEPENDS=() MODULE_DEPENDS=()
ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
if [ $SRS_HTTP = YES ]; then
ModuleLibIncs="${ModuleLibIncs[@]} ${LibHttpParserRoot}"
fi
MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
"srs_core_error" "srs_core_conn" "srs_core_client" "srs_core_error" "srs_core_conn" "srs_core_client"
"srs_core_rtmp" "srs_core_socket" "srs_core_buffer" "srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
@ -144,17 +150,10 @@ MAIN_OBJS="${MODULE_OBJS[@].o}"
# all main entrances # all main entrances
MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
# all depends libraries # all depends libraries
ModuleLibFiles=(${LibSTfile}) ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
if [ $SRS_HTTP = YES ]; then
ModuleLibFiles="${ModuleLibFiles[@]} ${LibHttpParserfile}"
fi
# all depends objects # all depends objects
MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}" MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}"
if [ $SRS_SSL = YES ]; then
LINK_OPTIONS="-ldl ${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"
else
LINK_OPTIONS="-ldl" LINK_OPTIONS="-ldl"
fi
# srs(simple rtmp server) over st(state-threads) # srs(simple rtmp server) over st(state-threads)
BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh
# bandwidth test tool, to test the bandwidth to server # bandwidth test tool, to test the bandwidth to server