正在显示
3 个修改的文件
包含
11 行增加
和
3 行删除
@@ -217,7 +217,6 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then | @@ -217,7 +217,6 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then | ||
217 | if [ $SRS_HTTP_CALLBACK = YES ]; then echo "http-callback for arm is not available, see: ./configure --help"; __check_ok=NO; fi | 217 | if [ $SRS_HTTP_CALLBACK = YES ]; then echo "http-callback for arm is not available, see: ./configure --help"; __check_ok=NO; fi |
218 | if [ $SRS_BWTC = YES ]; then echo "bwtc for arm is not available, see: ./configure --help"; __check_ok=NO; fi | 218 | if [ $SRS_BWTC = YES ]; then echo "bwtc for arm is not available, see: ./configure --help"; __check_ok=NO; fi |
219 | if [ $SRS_RESEARCH = YES ]; then echo "research for arm is not available, see: ./configure --help"; __check_ok=NO; fi | 219 | if [ $SRS_RESEARCH = YES ]; then echo "research for arm is not available, see: ./configure --help"; __check_ok=NO; fi |
220 | - if [ $SRS_UTEST = YES ]; then echo "utest for arm is not available, see: ./configure --help"; __check_ok=NO; fi | ||
221 | if [ $SRS_GPERF = YES ]; then echo "gperf for arm is not available, see: ./configure --help"; __check_ok=NO; fi | 220 | if [ $SRS_GPERF = YES ]; then echo "gperf for arm is not available, see: ./configure --help"; __check_ok=NO; fi |
222 | if [ $SRS_GPERF_MC = YES ]; then echo "gmc for arm is not available, see: ./configure --help"; __check_ok=NO; fi | 221 | if [ $SRS_GPERF_MC = YES ]; then echo "gmc for arm is not available, see: ./configure --help"; __check_ok=NO; fi |
223 | if [ $SRS_GPERF_MP = YES ]; then echo "gmp for arm is not available, see: ./configure --help"; __check_ok=NO; fi | 222 | if [ $SRS_GPERF_MP = YES ]; then echo "gmp for arm is not available, see: ./configure --help"; __check_ok=NO; fi |
trunk/auto/utest.sh
100644 → 100755
@@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
6 | # | 6 | # |
7 | # $APP_NAME the app name to output. ie. srs_utest | 7 | # $APP_NAME the app name to output. ie. srs_utest |
8 | # $MODULE_DIR the src dir of utest code. ie. src/utest | 8 | # $MODULE_DIR the src dir of utest code. ie. src/utest |
9 | +# $LINK_OPTIONS the link options for utest. ie. -lpthread -ldl | ||
9 | 10 | ||
10 | FILE=${SRS_OBJS}/utest/${SRS_MAKEFILE} | 11 | FILE=${SRS_OBJS}/utest/${SRS_MAKEFILE} |
11 | # create dir for Makefile | 12 | # create dir for Makefile |
@@ -169,7 +170,7 @@ echo "" >> ${FILE}; echo "" >> ${FILE} | @@ -169,7 +170,7 @@ echo "" >> ${FILE}; echo "" >> ${FILE} | ||
169 | echo "# generate the utest binary" >> ${FILE} | 170 | echo "# generate the utest binary" >> ${FILE} |
170 | cat << END >> ${FILE} | 171 | cat << END >> ${FILE} |
171 | ${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${APP_NAME} : \$(SRS_UTEST_DEPS) ${MODULE_OBJS} gtest_main.a | 172 | ${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${APP_NAME} : \$(SRS_UTEST_DEPS) ${MODULE_OBJS} gtest_main.a |
172 | - \$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES) -lpthread -ldl | 173 | + \$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES) ${LINK_OPTIONS} |
173 | END | 174 | END |
174 | 175 | ||
175 | ##################################################################################### | 176 | ##################################################################################### |
@@ -30,6 +30,10 @@ if [[ -f Makefile ]]; then | @@ -30,6 +30,10 @@ if [[ -f Makefile ]]; then | ||
30 | fi | 30 | fi |
31 | 31 | ||
32 | # write user options to headers | 32 | # write user options to headers |
33 | +echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H | ||
34 | +echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H | ||
35 | +echo "" >> $SRS_AUTO_HEADERS_H | ||
36 | + | ||
33 | echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H | 37 | echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H |
34 | echo "#define SRS_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H | 38 | echo "#define SRS_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H |
35 | echo "#define SRS_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H | 39 | echo "#define SRS_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H |
@@ -52,6 +56,10 @@ SrsArmRANDLIB="arm-linux-gnueabi-ranlib" | @@ -52,6 +56,10 @@ SrsArmRANDLIB="arm-linux-gnueabi-ranlib" | ||
52 | # apply user options. | 56 | # apply user options. |
53 | . auto/depends.sh | 57 | . auto/depends.sh |
54 | 58 | ||
59 | +# auto header EOF. | ||
60 | +echo "#endif" >> $SRS_AUTO_HEADERS_H | ||
61 | +echo "" >> $SRS_AUTO_HEADERS_H | ||
62 | + | ||
55 | ##################################################################################### | 63 | ##################################################################################### |
56 | # generate Makefile. | 64 | # generate Makefile. |
57 | ##################################################################################### | 65 | ##################################################################################### |
@@ -398,7 +406,7 @@ ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot}) | @@ -398,7 +406,7 @@ ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot}) | ||
398 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) | 406 | ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) |
399 | MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") | 407 | MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") |
400 | MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" | 408 | MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" |
401 | -MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh | 409 | +LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh |
402 | 410 | ||
403 | echo 'configure ok! ' | 411 | echo 'configure ok! ' |
404 | 412 |
-
请 注册 或 登录 后发表评论