正在显示
5 个修改的文件
包含
42 行增加
和
12 行删除
@@ -349,6 +349,7 @@ if [ $OS_IS_OSX = YES ]; then | @@ -349,6 +349,7 @@ if [ $OS_IS_OSX = YES ]; then | ||
349 | echo "OSX detected, must specifies the --osx" | 349 | echo "OSX detected, must specifies the --osx" |
350 | exit 1 | 350 | exit 1 |
351 | fi | 351 | fi |
352 | + # TODO: FIXME: support following features. | ||
352 | if [ $SRS_HTTP_API = YES ]; then | 353 | if [ $SRS_HTTP_API = YES ]; then |
353 | echo "OSX does not support http-api, use --without-http-api" | 354 | echo "OSX does not support http-api, use --without-http-api" |
354 | exit 1 | 355 | exit 1 |
@@ -357,6 +358,14 @@ if [ $OS_IS_OSX = YES ]; then | @@ -357,6 +358,14 @@ if [ $OS_IS_OSX = YES ]; then | ||
357 | echo "OSX does not support stat, use --without-stat" | 358 | echo "OSX does not support stat, use --without-stat" |
358 | exit 1 | 359 | exit 1 |
359 | fi | 360 | fi |
361 | + if [ $SRS_FFMPEG_TOOL = YES ]; then | ||
362 | + echo "OSX does not support ffmpeg, use --without-ffmpeg" | ||
363 | + exit 1 | ||
364 | + fi | ||
365 | + if [ $SRS_NGINX = YES ]; then | ||
366 | + echo "OSX does not support nginx, use --without-nginx" | ||
367 | + exit 1 | ||
368 | + fi | ||
360 | fi | 369 | fi |
361 | 370 | ||
362 | ##################################################################################### | 371 | ##################################################################################### |
@@ -723,3 +732,4 @@ fi | @@ -723,3 +732,4 @@ fi | ||
723 | # generated the test script | 732 | # generated the test script |
724 | ##################################################################################### | 733 | ##################################################################################### |
725 | rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/srs.test objs/srs.test | 734 | rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/srs.test objs/srs.test |
735 | + |
trunk/conf/mac.dev.conf
0 → 100644
1 | +# no-daemon and write log to console config for srs. | ||
2 | +# @see full.conf for detail config. | ||
3 | + | ||
4 | +listen 1935; | ||
5 | +max_connections 1000; | ||
6 | +daemon off; | ||
7 | +srs_log_tank console; | ||
8 | +http_api { | ||
9 | + enabled on; | ||
10 | + listen 1985; | ||
11 | +} | ||
12 | +http_server { | ||
13 | + enabled on; | ||
14 | + listen 8080; | ||
15 | +} | ||
16 | +vhost __defaultVhost__ { | ||
17 | + hls { | ||
18 | + enabled on; | ||
19 | + hls_fragment 10; | ||
20 | + hls_window 60; | ||
21 | + hls_path ./objs/nginx/html; | ||
22 | + } | ||
23 | +} |
@@ -9,13 +9,20 @@ SRS_OBJS_DIR="objs" | @@ -9,13 +9,20 @@ SRS_OBJS_DIR="objs" | ||
9 | SRS_OBJS="${SRS_WORKDIR}/${SRS_OBJS_DIR}" | 9 | SRS_OBJS="${SRS_WORKDIR}/${SRS_OBJS_DIR}" |
10 | mkdir -p ${SRS_OBJS} | 10 | mkdir -p ${SRS_OBJS} |
11 | 11 | ||
12 | -##################################################################################### | ||
13 | # linux shell color support. | 12 | # linux shell color support. |
14 | RED="\\033[31m" | 13 | RED="\\033[31m" |
15 | GREEN="\\033[32m" | 14 | GREEN="\\033[32m" |
16 | YELLOW="\\033[33m" | 15 | YELLOW="\\033[33m" |
17 | BLACK="\\033[0m" | 16 | BLACK="\\033[0m" |
18 | 17 | ||
18 | +# clean the exists, when not export srs-librtmp. | ||
19 | +# do this only when the options is ok. | ||
20 | +if [[ -f Makefile ]]; then | ||
21 | + make clean | ||
22 | +fi | ||
23 | +# remove makefile | ||
24 | +rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE} | ||
25 | + | ||
19 | ##################################################################################### | 26 | ##################################################################################### |
20 | # parse user options, set the variables like: | 27 | # parse user options, set the variables like: |
21 | # srs features: SRS_SSL/SRS_HLS/SRS_NGINX/SRS_FFMPEG_TOOL/SRS_HTTP_CALLBACK/...... | 28 | # srs features: SRS_SSL/SRS_HLS/SRS_NGINX/SRS_FFMPEG_TOOL/SRS_HTTP_CALLBACK/...... |
@@ -67,16 +74,6 @@ for SRS_MODULE in $SRS_MODULES; do | @@ -67,16 +74,6 @@ for SRS_MODULE in $SRS_MODULES; do | ||
67 | __mcleanups="$__mcleanups $SRS_MODULE_NAME" | 74 | __mcleanups="$__mcleanups $SRS_MODULE_NAME" |
68 | done | 75 | done |
69 | 76 | ||
70 | -# clean the exists, when not export srs-librtmp. | ||
71 | -# do this only when the options is ok. | ||
72 | -if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | ||
73 | - if [[ -f Makefile ]]; then | ||
74 | - make clean | ||
75 | - fi | ||
76 | -fi | ||
77 | -# remove makefile | ||
78 | -rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE} | ||
79 | - | ||
80 | ##################################################################################### | 77 | ##################################################################################### |
81 | # build tools or compiler args. | 78 | # build tools or compiler args. |
82 | # enable gdb debug | 79 | # enable gdb debug |
@@ -282,8 +282,8 @@ | @@ -282,8 +282,8 @@ | ||
282 | 3C1231E71AAE64A400CE8F6C /* srs_xcode */ = { | 282 | 3C1231E71AAE64A400CE8F6C /* srs_xcode */ = { |
283 | isa = PBXGroup; | 283 | isa = PBXGroup; |
284 | children = ( | 284 | children = ( |
285 | - 3C1232EF1AAEAC5800CE8F6C /* etc */, | ||
286 | 3C1232B81AAE824500CE8F6C /* configure */, | 285 | 3C1232B81AAE824500CE8F6C /* configure */, |
286 | + 3C1232EF1AAEAC5800CE8F6C /* etc */, | ||
287 | 3C1232BA1AAE826F00CE8F6C /* auto */, | 287 | 3C1232BA1AAE826F00CE8F6C /* auto */, |
288 | 3C1232B91AAE825100CE8F6C /* scripts */, | 288 | 3C1232B91AAE825100CE8F6C /* scripts */, |
289 | 3C12324B1AAE81CE00CE8F6C /* app */, | 289 | 3C12324B1AAE81CE00CE8F6C /* app */, |
-
请 注册 或 登录 后发表评论