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-03-10 13:13:31 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0ff49fd299f3acad12a907410500c02fbb46cbf5
0ff49fd2
1 parent
db7ddfd5
for #155, debug srs on xcode.
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
42 行增加
和
12 行删除
trunk/auto/depends.sh
trunk/conf/mac.dev.conf
trunk/configure
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/winlin.xcuserdatad/UserInterfaceState.xcuserstate
trunk/auto/depends.sh
查看文件 @
0ff49fd
...
...
@@ -349,6 +349,7 @@ if [ $OS_IS_OSX = YES ]; then
echo
"OSX detected, must specifies the --osx"
exit
1
fi
# TODO: FIXME: support following features.
if
[
$SRS_HTTP_API
=
YES
]
;
then
echo
"OSX does not support http-api, use --without-http-api"
exit
1
...
...
@@ -357,6 +358,14 @@ if [ $OS_IS_OSX = YES ]; then
echo
"OSX does not support stat, use --without-stat"
exit
1
fi
if
[
$SRS_FFMPEG_TOOL
=
YES
]
;
then
echo
"OSX does not support ffmpeg, use --without-ffmpeg"
exit
1
fi
if
[
$SRS_NGINX
=
YES
]
;
then
echo
"OSX does not support nginx, use --without-nginx"
exit
1
fi
fi
#####################################################################################
...
...
@@ -723,3 +732,4 @@ fi
# generated the test script
#####################################################################################
rm -rf
${
SRS_OBJS
}
/srs.test
&&
ln -sf
`
pwd
`
/scripts/srs.test objs/srs.test
...
...
trunk/conf/mac.dev.conf
0 → 100644
查看文件 @
0ff49fd
# no-daemon and write log to console config for srs.
# @see full.conf for detail config.
listen
1935
;
max_connections
1000
;
daemon
off
;
srs_log_tank
console
;
http_api
{
enabled
on
;
listen
1985
;
}
http_server
{
enabled
on
;
listen
8080
;
}
vhost
__
defaultVhost__
{
hls
{
enabled
on
;
hls_fragment
10
;
hls_window
60
;
hls_path
./
objs
/
nginx
/
html
;
}
}
...
...
trunk/configure
查看文件 @
0ff49fd
...
...
@@ -9,13 +9,20 @@ SRS_OBJS_DIR="objs"
SRS_OBJS
=
"
${
SRS_WORKDIR
}
/
${
SRS_OBJS_DIR
}
"
mkdir -p
${
SRS_OBJS
}
#####################################################################################
# linux shell color support.
RED
=
"
\\
033[31m"
GREEN
=
"
\\
033[32m"
YELLOW
=
"
\\
033[33m"
BLACK
=
"
\\
033[0m"
# clean the exists, when not export srs-librtmp.
# do this only when the options is ok.
if
[[
-f Makefile
]]
;
then
make clean
fi
# remove makefile
rm -f
${
SRS_WORKDIR
}
/
${
SRS_MAKEFILE
}
#####################################################################################
# parse user options, set the variables like:
# 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
__mcleanups
=
"
$__mcleanups
$SRS_MODULE_NAME
"
done
# clean the exists, when not export srs-librtmp.
# do this only when the options is ok.
if
[
$SRS_EXPORT_LIBRTMP_PROJECT
=
NO
]
;
then
if
[[
-f Makefile
]]
;
then
make clean
fi
fi
# remove makefile
rm -f
${
SRS_WORKDIR
}
/
${
SRS_MAKEFILE
}
#####################################################################################
# build tools or compiler args.
# enable gdb debug
...
...
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
查看文件 @
0ff49fd
...
...
@@ -282,8 +282,8 @@
3C1231E71AAE64A400CE8F6C /* srs_xcode */ = {
isa = PBXGroup;
children = (
3C1232EF1AAEAC5800CE8F6C /* etc */,
3C1232B81AAE824500CE8F6C /* configure */,
3C1232EF1AAEAC5800CE8F6C /* etc */,
3C1232BA1AAE826F00CE8F6C /* auto */,
3C1232B91AAE825100CE8F6C /* scripts */,
3C12324B1AAE81CE00CE8F6C /* app */,
...
...
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/winlin.xcuserdatad/UserInterfaceState.xcuserstate
查看文件 @
0ff49fd
不能预览此文件类型
请
注册
或
登录
后发表评论