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-17 21:00:28 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c991c2c92c32b44addc8df07f8a6f2900cec0499
c991c2c9
1 parent
13299ac0
remove osx support for 1.0.30
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
7 行增加
和
3 行删除
README.md
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/src/core/srs_core.hpp
README.md
查看文件 @
c991c2c
...
...
@@ -388,6 +388,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-03-17, remove the osx for 1.0.30.
*
v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
*
<strong>
v1.0, 2015-02-12,
[
1.0r2 release(1.0.27)
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2
)
released. 59507 lines.
</strong>
*
v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27.
...
...
trunk/auto/depends.sh
查看文件 @
c991c2c
...
...
@@ -299,6 +299,11 @@ function OSX_prepare()
}
OSX_prepare;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"OSX prepare failed, ret=
$ret
"
;
exit
$ret
;
fi
# by winlin, disable other system.
if
[[
$OS_IS_UBUNTU
=
NO
&&
$OS_IS_CENTOS
=
NO
&&
$SRS_EMBEDED_CPU
=
NO
]]
;
then
echo
"only support Centos and Ubuntu, actual is
`
uname -s
`
"
exit
1
fi
#####################################################################################
# st-1.9
...
...
trunk/auto/options.sh
查看文件 @
c991c2c
...
...
@@ -161,7 +161,6 @@ Options:
Presets:
--x86-x64 [default] for x86/x64 cpu, common pc and servers.
--osx for IOS(darwin) to build SRS.
--pi for raspberry-pi(directly build), open features hls/ssl/static.
--cubie for cubieboard(directly build), open features except ffmpeg/nginx.
--arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild
...
...
@@ -252,7 +251,6 @@ function parse_user_option() {
--log-trace
)
SRS_LOG_TRACE
=
YES
;;
--x86-x64
)
SRS_X86_X64
=
YES
;;
--osx
)
SRS_OSX
=
YES
;;
--arm
)
SRS_ARM_UBUNTU12
=
YES
;;
--mips
)
SRS_MIPS_UBUNTU12
=
YES
;;
--pi
)
SRS_PI
=
YES
;;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
c991c2c
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION
29
#define VERSION_REVISION
30
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论