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-09-23 10:27:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7dcdb18588af51fa8d5d779308bc7b6bf911b927
7dcdb185
1 parent
a8829e0a
support build on pi and cubie
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
15 行增加
和
15 行删除
trunk/auto/auto_headers.sh
trunk/auto/depends.sh
trunk/auto/generate-srs-librtmp-project.sh
trunk/auto/options.sh
trunk/configure
trunk/auto/auto_headers.sh
查看文件 @
7dcdb18
...
...
@@ -67,7 +67,7 @@ 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
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
echo
"cc=
$SrsArmCC
gcc=
$SrsArmGCC
g++=
$SrsArmCXX
ar=
$SrsArmAR
ld=
$SrsArmLD
randlib=
$SrsArmRANDLIB
"
echo
"#define SRS_AUTO_EMBEDED_TOOL_CHAIN
\"
cc=
$SrsArmCC
gcc=
$SrsArmGCC
g++=
$SrsArmCXX
ar=
$SrsArmAR
ld=
$SrsArmLD
randlib=
$SrsArmRANDLIB
\"
"
>>
$SRS_AUTO_HEADERS_H
else
...
...
@@ -200,7 +200,7 @@ fi
#####################################################################################
# for embeded.
#####################################################################################
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
echo
"#define SRS_AUTO_EMBEDED_CPU"
>>
$SRS_AUTO_HEADERS_H
else
echo
"#undef SRS_AUTO_EMBEDED_CPU"
>>
$SRS_AUTO_HEADERS_H
...
...
trunk/auto/depends.sh
查看文件 @
7dcdb18
...
...
@@ -148,7 +148,7 @@ function Centos_prepare()
fi
# for arm, install the cross build tool chain.
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
echo
"embeded(arm/mips) is invalid for CentOS"
return
1
fi
...
...
@@ -253,7 +253,7 @@ function OSX_prepare()
fi
# for arm, install the cross build tool chain.
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
echo
"embeded(arm/mips) is invalid for OSX"
return
1
fi
...
...
@@ -367,7 +367,7 @@ fi
# export srs-librtmp
# others is invalid.
if
[[
$OS_IS_UBUNTU
=
NO
&&
$OS_IS_CENTOS
=
NO
&&
$OS_IS_OSX
=
NO
&&
$SRS_EXPORT_LIBRTMP_PROJECT
=
NO
]]
;
then
if
[[
$SRS_PI
=
NO
&&
$SRS_CUBIE
=
NO
&&
$SRS_
EMBEDED_CPU
=
NO
]]
;
then
if
[[
$SRS_PI
=
NO
&&
$SRS_CUBIE
=
NO
&&
$SRS_
CROSS_BUILD
=
NO
]]
;
then
echo
"what a fuck, os not supported."
exit
1
fi
...
...
@@ -385,7 +385,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
fi
# memory leak for linux-optimized
# @see: https://github.com/simple-rtmp-server/srs/issues/197
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
# ok, arm specified, if the flag filed does not exists, need to rebuild.
if
[[
-f
${
SRS_OBJS
}
/_flag.st.arm.tmp
&&
-f
${
SRS_OBJS
}
/st/libst.a
]]
;
then
echo
"st-1.9t for arm is ok."
;
...
...
@@ -432,7 +432,7 @@ fi
# check the arm flag file, if flag changed, need to rebuild the st.
if
[
$SRS_HTTP_CORE
=
YES
]
;
then
# ok, arm specified, if the flag filed does not exists, need to rebuild.
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
if
[[
-f
${
SRS_OBJS
}
/_flag.st.hp.tmp
&&
-f
${
SRS_OBJS
}
/hp/http_parser.h
&&
-f
${
SRS_OBJS
}
/hp/libhttp_parser.a
]]
;
then
echo
"http-parser-2.1 for arm is ok."
;
else
...
...
@@ -487,7 +487,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
mkdir -p
${
SRS_OBJS
}
/nginx
fi
# make nginx
__SRS_BUILD_NGINX
=
NO;
if
[
$SRS_
EMBEDED_CPU
=
NO
]
;
then if
[
$SRS_NGINX
=
YES
]
;
then
__SRS_BUILD_NGINX
=
YES;
fi fi
__SRS_BUILD_NGINX
=
NO;
if
[
$SRS_
CROSS_BUILD
=
NO
]
;
then if
[
$SRS_NGINX
=
YES
]
;
then
__SRS_BUILD_NGINX
=
YES;
fi fi
if
[
$__SRS_BUILD_NGINX
=
YES
]
;
then
if
[[
-f
${
SRS_OBJS
}
/nginx/sbin/nginx
]]
;
then
echo
"nginx-1.5.7 is ok."
;
...
...
@@ -599,7 +599,7 @@ fi
#####################################################################################
# extra configure options
CONFIGURE_TOOL
=
"./config"
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
CONFIGURE_TOOL
=
"./Configure linux-armv4"
fi
if
[
$SRS_OSX
=
YES
]
;
then
...
...
@@ -614,7 +614,7 @@ if [ $SRS_SSL = YES ]; then
echo
"warning: donot compile ssl, use system ssl"
else
# check the arm flag file, if flag changed, need to rebuild the st.
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
# ok, arm specified, if the flag filed does not exists, need to rebuild.
if
[[
-f
${
SRS_OBJS
}
/_flag.ssl.arm.tmp
&&
-f
${
SRS_OBJS
}
/openssl/lib/libssl.a
]]
;
then
echo
"openssl-1.0.1f for arm is ok."
;
...
...
trunk/auto/generate-srs-librtmp-project.sh
查看文件 @
7dcdb18
trunk/auto/options.sh
查看文件 @
7dcdb18
...
...
@@ -101,7 +101,7 @@ SRS_ENABLE_ALL=NO
#
################################################################
# whether cross build for embed cpu, arm/mips
SRS_
EMBEDED_CPU
=
NO
SRS_
CROSS_BUILD
=
NO
#####################################################################################
# menu
...
...
@@ -363,10 +363,10 @@ function apply_user_presets() {
# whether embeded cpu.
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
SRS_
EMBEDED_CPU
=
YES
SRS_
CROSS_BUILD
=
YES
fi
if
[
$SRS_MIPS_UBUNTU12
=
YES
]
;
then
SRS_
EMBEDED_CPU
=
YES
SRS_
CROSS_BUILD
=
YES
fi
# all disabled.
...
...
@@ -879,7 +879,7 @@ function check_option_conflicts() {
# check embeded(arm/mips), if embeded enabled, only allow st/ssl/librtmp,
# user should disable all other features
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
if
[
$SRS_FFMPEG_TOOL
=
YES
]
;
then
echo
"ffmpeg for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_RESEARCH
=
YES
]
;
then
echo
"research for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
if
[
$SRS_GPERF
=
YES
]
;
then
echo
"gperf for arm is not available, see: ./configure --help"
;
__check_ok
=
NO;
fi
...
...
trunk/configure
查看文件 @
7dcdb18
...
...
@@ -285,7 +285,7 @@ __REAL_INSTALL=\$(DESTDIR)\$(SRS_PREFIX)
END
# embeded, ubuntu12, use embeded tool chain.
if
[
$SRS_
EMBEDED_CPU
=
YES
]
;
then
if
[
$SRS_
CROSS_BUILD
=
YES
]
;
then
cat
<< END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
default:
\$(MAKE) GCC=${SrsArmGCC} CXX=${SrsArmCXX} AR=${SrsArmAR} LINK=${SrsArmCXX} _default
...
...
请
注册
或
登录
后发表评论