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-05-04 18:52:32 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
97f4d811933e5c865f9bffd71b6ac7b12c449e94
97f4d811
1 parent
a88e95d5
fix bug of mips
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
12 行增加
和
13 行删除
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/configure
trunk/auto/depends.sh
查看文件 @
97f4d81
...
...
@@ -107,7 +107,7 @@ function Ubuntu_prepare()
# for arm, install the cross build tool chain.
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
`
$SrsArmCC
`
--help
>/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
`
$SrsArmCC
--help
`
>/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi"
require_sudoer
"sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi"
sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then return
$ret
;
fi
...
...
@@ -117,7 +117,7 @@ function Ubuntu_prepare()
# for mips, user must installed the tool chain.
if
[
$SRS_MIPS_UBUNTU12
=
YES
]
;
then
`
$SrsArmCC
`
--help
>/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
`
$SrsArmCC
--help
`
>/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"user must install the tool chain:
$SrsArmCC
"
return
2
fi
...
...
trunk/auto/options.sh
查看文件 @
97f4d81
...
...
@@ -140,6 +140,7 @@ Presets:
--x86-x64 [default] for x86/x64 cpu, common pc and servers.
--pi for raspberry-pi(directly build), open features hls/ssl/static.
--arm alias for --with-arm-ubuntu12
--mips alias for --with-mips-ubuntu12
--dev for dev, open all features, no gperf/gprof/arm.
--fast the most fast compile, nothing, only support vp6 RTMP.
--pure-rtmp only support RTMP with ssl.
...
...
@@ -147,13 +148,11 @@ Presets:
--disable-all disable all features, only support vp6 RTMP.
Conflicts:
1. --dev/x86-x64 vs --static:
the --static only for arm cpus.
2. --with-gmc vs --with-gmp:
1. --with-gmc vs --with-gmp:
@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html
3
. --with-gperf/gmc/gmp vs --with-gprof:
2
. --with-gperf/gmc/gmp vs --with-gprof:
gperftools not compatible with gprof.
4
. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof:
3
. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof:
the complex tools not available for arm.
Experts:
...
...
trunk/configure
查看文件 @
97f4d81
...
...
@@ -64,12 +64,12 @@ if [ $SRS_MIPS_UBUNTU12 = YES ]; then
__SrsArmRANDLIB
=
"mipsel-openwrt-linux-ranlib"
;
fi
# the arm-ubuntu12 options for make for depends
if
[[
-z
$SrsArmCC
]]
;
then
SrsArmCC
=
__SrsArmCC;
fi
if
[[
-z
$SrsArmGCC
]]
;
then
SrsArmGCC
=
__SrsArmGCC;
fi
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
if
[[
-z
$SrsArmCC
]]
;
then
SrsArmCC
=
$__SrsArmCC
;
fi
if
[[
-z
$SrsArmGCC
]]
;
then
SrsArmGCC
=
$__SrsArmGCC
;
fi
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
# write to source file
if
[
$SRS_EMBEDED_CPU
=
YES
]
;
then
echo
"cc=
$SrsArmCC
gcc=
$SrsArmGCC
g++=
$SrsArmCXX
ar=
$SrsArmAR
ld=
$SrsArmLD
randlib=
$SrsArmRANDLIB
"
...
...
请
注册
或
登录
后发表评论