Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-05-24 18:56:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cf9ee04611ef610350e56f6ea423841db01243b5
cf9ee046
1 parent
069ee0af
fix the utest build failed bug.
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
6 行增加
和
6 行删除
trunk/configure
trunk/configure
查看文件 @
cf9ee04
...
...
@@ -153,15 +153,15 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream"
KERNEL_INCS
=
"src/kernel"
;
MODULE_DIR
=
${
KERNEL_INCS
}
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
#RTMP
/HTTP/Raw
Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
MODULE_ID
=
"PROTOCOL"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
ModuleLibIncs
=(
${
SRS_OBJS_DIR
}
${
LibSSLRoot
}
)
MODULE_FILES
=(
"srs_rtmp_amf0"
"srs_rtmp_io"
"srs_rtmp_stack"
"srs_rtmp_sdk"
"srs_rtmp_handshake"
"srs_rtmp_utility"
"srs_rtmp_msg_array"
"srs_protocol_buffer"
"srs_raw_avc"
"srs_rtsp_stack"
"srs_http_stack"
"srs_protocol_kbps"
)
RTMP_INCS
=
"src/protocol"
;
MODULE_DIR
=
${
RTMP_INCS
}
. auto/modules.sh
RTMP_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
PROTOCOL_INCS
=
"src/protocol"
;
MODULE_DIR
=
${
PROTOCOL_INCS
}
. auto/modules.sh
PROTOCOL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#App Module
if
[
$SRS_EXPORT_LIBRTMP_PROJECT
=
NO
]
;
then
...
...
@@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
# all depends libraries
ModuleLibFiles
=(
${
LibSTfile
}
${
LibHttpParserfile
}
${
LibSSLfile
}
${
LibGperfFile
}
)
# all depends objects
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
RTMP
_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
PROTOCOL
_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
LINK_OPTIONS
=
"
${
SrsLinkOptions
}${
SrsGprofLink
}${
SrsGperfLink
}
"
#
# srs: srs(simple rtmp server) over st(state-threads)
...
...
@@ -246,7 +246,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
fi
# srs librtmp
if
[
$SRS_LIBRTMP
=
YES
]
;
then
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
RTMP
_OBJS
[@]
}
${
LIBS_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
PROTOCOL
_OBJS
[@]
}
${
LIBS_OBJS
[@]
}
"
BUILD_KEY
=
"librtmp"
LIB_NAME
=
"lib/srs_librtmp"
. auto/libs.sh
fi
#
...
...
@@ -258,7 +258,7 @@ if [ $SRS_UTEST = YES ]; then
ModuleLibIncs
=(
${
SRS_OBJS_DIR
}
${
LibSTRoot
}
${
LibSSLRoot
}
)
ModuleLibFiles
=(
${
LibSTfile
}
${
LibHttpParserfile
}
${
LibSSLfile
}
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"PROTOCOL"
"APP"
)
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
RTMP
_OBJS
[@]
}
${
APP_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
PROTOCOL
_OBJS
[@]
}
${
APP_OBJS
[@]
}
"
LINK_OPTIONS
=
"-lpthread
${
SrsLinkOptions
}
"
MODULE_DIR
=
"src/utest"
APP_NAME
=
"srs_utest"
. auto/utest.sh
fi
...
...
请
注册
或
登录
后发表评论