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
2014-03-25 14:36:30 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a9d11df3a3defee4503212875426f2f1057ee18e
a9d11df3
1 parent
a6d9da5e
update arm tool chain
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
12 行增加
和
6 行删除
trunk/configure
trunk/src/main/srs_main_server.cpp
trunk/configure
查看文件 @
a9d11df
...
...
@@ -47,12 +47,15 @@ echo "" >> $SRS_AUTO_HEADERS_H
# generate auto headers file, depends on the finished of options.sh
#####################################################################################
# the arm-ubuntu12 options for make for depends
SrsArmCC
=
"arm-linux-gnueabi-gcc"
SrsArmGCC
=
"arm-linux-gnueabi-gcc"
SrsArmCXX
=
"arm-linux-gnueabi-g++"
SrsArmAR
=
"arm-linux-gnueabi-ar"
SrsArmLD
=
"arm-linux-gnueabi-ld"
SrsArmRANDLIB
=
"arm-linux-gnueabi-ranlib"
if
[[
-z
$SrsArmCC
]]
;
then
SrsArmCC
=
"arm-linux-gnueabi-gcc"
;
fi
if
[[
-z
$SrsArmGCC
]]
;
then
SrsArmGCC
=
"arm-linux-gnueabi-gcc"
;
fi
if
[[
-z
$SrsArmCXX
]]
;
then
SrsArmCXX
=
"arm-linux-gnueabi-g++"
;
fi
if
[[
-z
$SrsArmAR
]]
;
then
SrsArmAR
=
"arm-linux-gnueabi-ar"
;
fi
if
[[
-z
$SrsArmLD
]]
;
then
SrsArmLD
=
"arm-linux-gnueabi-ld"
;
fi
if
[[
-z
$SrsArmRANDLIB
]]
;
then
SrsArmRANDLIB
=
"arm-linux-gnueabi-ranlib"
;
fi
echo
"cc=
$SrsArmCC
gcc=
$SrsArmGCC
g++=
$SrsArmCXX
ar=
$SrsArmAR
ld=
$SrsArmLD
randlib=
$SrsArmRANDLIB
"
echo
"#define SRS_ARM_TOOL_CHAIN
\"
cc=
$SrsArmCC
gcc=
$SrsArmGCC
g++=
$SrsArmCXX
ar=
$SrsArmAR
ld=
$SrsArmLD
randlib=
$SrsArmRANDLIB
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
""
>>
$SRS_AUTO_HEADERS_H
# apply user options.
. auto/depends.sh
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
a9d11df
...
...
@@ -161,6 +161,9 @@ int main(int argc, char** argv)
srs_trace
(
"uname: "
SRS_UNAME
);
srs_trace
(
"build: %s, %s"
,
SRS_BUILD_DATE
,
srs_is_little_endian
()
?
"little-endian"
:
"big-endian"
);
srs_trace
(
"configure: "
SRS_CONFIGURE
);
#ifdef SRS_ARM_UBUNTU12
srs_trace
(
"arm tool chain: "
SRS_ARM_TOOL_CHAIN
);
#endif
if
((
ret
=
_srs_server
->
initialize
())
!=
ERROR_SUCCESS
)
{
return
ret
;
...
...
请
注册
或
登录
后发表评论