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-13 17:34:33 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
74fa3ba16fa36dd8827e3637b62f70cc72a37182
74fa3ba1
1 parent
a15ce114
fix build failed for linux.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
3 行增加
和
3 行删除
trunk/auto/depends.sh
trunk/auto/depends.sh
查看文件 @
74fa3ba
...
...
@@ -373,7 +373,7 @@ fi
#####################################################################################
if
[
$SRS_EXPORT_LIBRTMP_PROJECT
=
NO
]
;
then
# check the arm flag file, if flag changed, need to rebuild the st.
_ST_MAKE
=
linux-debug
&&
_ST_EXTRA_CFLAGS
=
"-DMD_HAVE_EPOLL"
_ST_MAKE
=
linux-debug
&&
_ST_EXTRA_CFLAGS
=
"
EXTRA_CFLAGS=
-DMD_HAVE_EPOLL"
# for osx, use darwin for st, donot use epoll.
if
[
$OS_IS_OSX
=
YES
]
;
then
_ST_MAKE
=
darwin-debug
&&
_ST_EXTRA_CFLAGS
=
""
...
...
@@ -392,8 +392,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
rm -rf
${
SRS_OBJS
}
/st-1.9
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/st-1.9.zip
&&
cd
st-1.9
&&
patch -p0 -R < ../../3rdparty/patches/1.st.arm.patch
&&
make
CC
=
${
SrsArmCC
}
AR
=
${
SrsArmAR
}
LD
=
${
SrsArmLD
}
RANDLIB
=
${
SrsArmRANDLIB
}
\
EXTRA_CFLAGS
=
${
_ST_EXTRA_CFLAGS
}
${
_ST_MAKE
}
&&
make
${
_ST_MAKE
}
CC
=
${
SrsArmCC
}
AR
=
${
SrsArmAR
}
LD
=
${
SrsArmLD
}
RANDLIB
=
${
SrsArmRANDLIB
}
\
EXTRA_CFLAGS
=
${
_ST_EXTRA_CFLAGS
}
&&
cd
..
&&
rm -rf st
&&
ln -sf st-1.9/obj st
&&
cd
..
&&
touch
${
SRS_OBJS
}
/_flag.st.arm.tmp
)
...
...
请
注册
或
登录
后发表评论