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-10-26 13:34:28 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e08beba89e99627775b51062a664ca42b725d804
e08beba8
1 parent
45385241
fix the sed command for arm
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
3 行增加
和
4 行删除
trunk/auto/depends.sh
trunk/auto/setup_variables.sh
trunk/auto/depends.sh
查看文件 @
e08beba
...
...
@@ -361,6 +361,9 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
OSX_prepare;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"OSX prepare failed, ret=
$ret
"
;
exit
$ret
;
fi
fi
# the sed command
SED
=
"sed -i"
&&
if
[
$OS_IS_OSX
=
YES
]
;
then
SED
=
"sed -i ''"
;
fi
#####################################################################################
# check the os.
#####################################################################################
...
...
trunk/auto/setup_variables.sh
查看文件 @
e08beba
...
...
@@ -28,7 +28,3 @@ if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi
if
[[
-z
$SrsArmAR
]]
;
then
SrsArmAR
=
$__SrsArmAR
;
fi
if
[[
-z
$SrsArmLD
]]
;
then
SrsArmLD
=
$__SrsArmLD
;
fi
if
[[
-z
$SrsArmRANDLIB
]]
;
then
SrsArmRANDLIB
=
$__SrsArmRANDLIB
;
fi
# the sed command
SED
=
"sed -i"
if
[
$OS_IS_OSX
=
YES
]
;
then
SED
=
"sed -i ''"
;
fi
...
...
请
注册
或
登录
后发表评论