Skip to content

Commit b53e981

Browse files
committed
Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release
2 parents fc99547 + cf9ee04 commit b53e981

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

trunk/configure

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream"
153153
KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
154154
KERNEL_OBJS="${MODULE_OBJS[@]}"
155155
#
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.
157157
MODULE_ID="PROTOCOL"
158158
MODULE_DEPENDS=("CORE" "KERNEL")
159159
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
160160
MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk"
161161
"srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer"
162162
"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[@]}"
165165
#
166166
#App Module
167167
if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
@@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
228228
# all depends libraries
229229
ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile} ${LibGperfFile})
230230
# 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[@]}"
232232
LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}"
233233
#
234234
# srs: srs(simple rtmp server) over st(state-threads)
@@ -246,7 +246,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
246246
fi
247247
# srs librtmp
248248
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[@]}"
250250
BUILD_KEY="librtmp" LIB_NAME="lib/srs_librtmp" . auto/libs.sh
251251
fi
252252
#
@@ -258,7 +258,7 @@ if [ $SRS_UTEST = YES ]; then
258258
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot})
259259
ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
260260
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[@]}"
262262
LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh
263263
fi
264264

0 commit comments

Comments
 (0)