正在显示
1 个修改的文件
包含
6 行增加
和
6 行删除
| @@ -153,15 +153,15 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" | @@ -153,15 +153,15 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" | ||
| 153 | KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh | 153 | KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh |
| 154 | KERNEL_OBJS="${MODULE_OBJS[@]}" | 154 | KERNEL_OBJS="${MODULE_OBJS[@]}" |
| 155 | # | 155 | # |
| 156 | -#RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features. | 156 | +#RTMP/HTTP/Raw Protocol, depends on core/kernel, provides rtmp/htttp protocol features. |
| 157 | MODULE_ID="PROTOCOL" | 157 | MODULE_ID="PROTOCOL" |
| 158 | MODULE_DEPENDS=("CORE" "KERNEL") | 158 | MODULE_DEPENDS=("CORE" "KERNEL") |
| 159 | ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) | 159 | ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) |
| 160 | MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk" | 160 | MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk" |
| 161 | "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer" | 161 | "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer" |
| 162 | "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps") | 162 | "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps") |
| 163 | -RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh | ||
| 164 | -RTMP_OBJS="${MODULE_OBJS[@]}" | 163 | +PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh |
| 164 | +PROTOCOL_OBJS="${MODULE_OBJS[@]}" | ||
| 165 | # | 165 | # |
| 166 | #App Module | 166 | #App Module |
| 167 | if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | 167 | if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then |
| @@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | @@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | ||
| 228 | # all depends libraries | 228 | # all depends libraries |
| 229 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile} ${LibGperfFile}) | 229 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile} ${LibGperfFile}) |
| 230 | # all depends objects | 230 | # all depends objects |
| 231 | - MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" | 231 | + MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" |
| 232 | LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}" | 232 | LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}" |
| 233 | # | 233 | # |
| 234 | # srs: srs(simple rtmp server) over st(state-threads) | 234 | # srs: srs(simple rtmp server) over st(state-threads) |
| @@ -246,7 +246,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | @@ -246,7 +246,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | ||
| 246 | fi | 246 | fi |
| 247 | # srs librtmp | 247 | # srs librtmp |
| 248 | if [ $SRS_LIBRTMP = YES ]; then | 248 | if [ $SRS_LIBRTMP = YES ]; then |
| 249 | - MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${LIBS_OBJS[@]}" | 249 | + MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${LIBS_OBJS[@]}" |
| 250 | BUILD_KEY="librtmp" LIB_NAME="lib/srs_librtmp" . auto/libs.sh | 250 | BUILD_KEY="librtmp" LIB_NAME="lib/srs_librtmp" . auto/libs.sh |
| 251 | fi | 251 | fi |
| 252 | # | 252 | # |
| @@ -258,7 +258,7 @@ if [ $SRS_UTEST = YES ]; then | @@ -258,7 +258,7 @@ if [ $SRS_UTEST = YES ]; then | ||
| 258 | ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot}) | 258 | ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot}) |
| 259 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) | 259 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) |
| 260 | MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP") | 260 | MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP") |
| 261 | - MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" | 261 | + MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]}" |
| 262 | LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh | 262 | LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh |
| 263 | fi | 263 | fi |
| 264 | 264 |
-
请 注册 或 登录 后发表评论