diff --git a/trunk/configure b/trunk/configure index ad517dc93..93ee7e667 100755 --- a/trunk/configure +++ b/trunk/configure @@ -158,6 +158,9 @@ fi if [ $SRS_GPERF_MD = YES ]; then LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_debug.a"; fi +#srt code path +LibSRTRoot="${SRS_WORKDIR}/src/srt" + # the link options, always use static link SrsLinkOptions="-pthread -ldl -lsrt"; if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL == YES ]]; then @@ -212,7 +215,7 @@ MODULE_ID="SRT" MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "SERVICE" "APP") ModuleLibIncs=(${SRS_OBJS_DIR}) MODULE_FILES=("srt_server" "srt_handle" "srt_conn" "srt_to_rtmp" "ts_demux" "srt_data") -SRT_INCS="src/srt"; MODULE_DIR=${SRT_INCS} . auto/modules.sh +SRT_INCS=${LibSRTRoot}; MODULE_DIR=${LibSRTRoot} . auto/modules.sh SRT_OBJS="${MODULE_OBJS[@]}" # #Service Module, for both Server and Client Modules. @@ -232,7 +235,7 @@ fi if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then MODULE_ID="APP" MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "SERVICE") - ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibSSLRoot}) + ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibSSLRoot} ${LibSRTRoot}) MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_source" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" @@ -267,7 +270,7 @@ LIBS_OBJS="${MODULE_OBJS[@]}" if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then MODULE_ID="SERVER" MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "SERVICE" "APP" "SRT") - ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot} ${LibSSLRoot}) + ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot} ${LibSSLRoot} ${LibSRTRoot}) MODULE_FILES=("srs_main_server") SERVER_INCS="src/main"; MODULE_DIR=${SERVER_INCS} . auto/modules.sh SERVER_OBJS="${MODULE_OBJS[@]}" @@ -333,7 +336,7 @@ if [ $SRS_UTEST = YES ]; then MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" "srs_utest_kernel" "srs_utest_core" "srs_utest_config" "srs_utest_rtmp" "srs_utest_http" "srs_utest_avc" "srs_utest_reload" "srs_utest_mp4" "srs_utest_service" "srs_utest_app") - ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot}) + ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot} ${LibSRTRoot}) ModuleLibFiles=(${LibSTfile} ${LibSSLfile}) MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "SERVICE" "APP" "SRT") MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${SERVICE_OBJS[@]} ${APP_OBJS[@]}" diff --git a/trunk/modules/hls-ingester/config b/trunk/modules/hls-ingester/config deleted file mode 100644 index eda6a1363..000000000 --- a/trunk/modules/hls-ingester/config +++ /dev/null @@ -1,7 +0,0 @@ - -# The module to ingest hls to replace ffmpeg with better behavior. -SRS_MODULE_NAME=("srs_hls_ingester") -SRS_MODULE_MAIN=("srs_main_ingest_hls") -SRS_MODULE_APP=() -SRS_MODULE_DEFINES="" -SRS_MODULE_MAKEFILE="" diff --git a/trunk/modules/mp4-parser/config b/trunk/modules/mp4-parser/config deleted file mode 100644 index 7f9adfd66..000000000 --- a/trunk/modules/mp4-parser/config +++ /dev/null @@ -1,7 +0,0 @@ - -# The module to parse mp4 file. -SRS_MODULE_NAME=("srs_mp4_parser") -SRS_MODULE_MAIN=("srs_main_mp4_parser") -SRS_MODULE_APP=() -SRS_MODULE_DEFINES="" -SRS_MODULE_MAKEFILE="" diff --git a/trunk/modules/readme.txt b/trunk/modules/readme.txt deleted file mode 100644 index 32d7891f0..000000000 --- a/trunk/modules/readme.txt +++ /dev/null @@ -1,27 +0,0 @@ -SRS Module Rules(SRS模块规则) -1. Each module in its seperate home directory(一个模块一个目录). -2. There is a config file in home(目录下放一个config文件). -3. All variables in configure are available(所有的configure中的变量模块中可以使用). - -The Variables in config(模块中需要定义变量,例如): -1. SRS_MODULE_NAME:The application binary name, optional. (模块名称,用来做Makefile的phony以及执行binary文件名。模块的二进制输出。为空时没有独立的二进制。) -2. SRS_MODULE_MAIN:The source file in src/main directory, optional. (模块的main函数所在的cpp文件,在src/main目录。模块在main的文件。可以为空。) -3. SRS_MODULE_APP:The source file in src/app directory, optional. (模块在src/app目录的源文件列表。模块在app的文件。可以为空。) -4. SRS_MODULE_DEFINES: The extra defined macros, optional. (模块编译时的额外宏定义。在app和main模块加入。可以为空。) -5. SRS_MODULE_MAKEFILE: The specified Makefile, optional. (模块的Makefile。在make时会执行这个Makefile。可以为空。) - -Reset all Variables at the beginning(在配置开头必须清空这些变量): -SRS_MODULE_NAME=() -SRS_MODULE_MAIN=() -SRS_MODULE_APP=() -SRS_MODULE_DEFINES="" -SRS_MODULE_MAKEFILE="" - -For example(下面是一个实例): -SRS_MODULE_NAME=("srs_rtmfpd") -SRS_MODULE_MAIN=("srs_main_rtmfpd") -SRS_MODULE_APP=("srs_app_rtfmpd") -SRS_MODULE_DEFINES="-DRTMFPD" -SRS_MODULE_MAKEFILE="modules/rtmfpd/Makefile" - -winlin, 2015.3