正在显示
2 个修改的文件
包含
9 行增加
和
6 行删除
@@ -362,12 +362,15 @@ fi | @@ -362,12 +362,15 @@ fi | ||
362 | ##################################################################################### | 362 | ##################################################################################### |
363 | # user must specifies something what a fuck, we suppport following os: | 363 | # user must specifies something what a fuck, we suppport following os: |
364 | # centos/ubuntu/osx, | 364 | # centos/ubuntu/osx, |
365 | -# embeded system, for example, mips or arm, | 365 | +# cross build for embeded system, for example, mips or arm, |
366 | +# directly build on arm/mips, for example, pi or cubie, | ||
366 | # export srs-librtmp | 367 | # export srs-librtmp |
367 | # others is invalid. | 368 | # others is invalid. |
368 | -if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $OS_IS_OSX = NO && $SRS_EMBEDED_CPU = NO && $SRS_EXPORT_LIBRTMP_PROJECT = NO ]]; then | ||
369 | - echo "what a fuck, os not supported." | ||
370 | - exit 1 | 369 | +if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $OS_IS_OSX = NO && $SRS_EXPORT_LIBRTMP_PROJECT = NO ]]; then |
370 | + if [[ $SRS_PI = NO && $SRS_CUBIE = NO && $SRS_EMBEDED_CPU = NO ]]; then | ||
371 | + echo "what a fuck, os not supported." | ||
372 | + exit 1 | ||
373 | + fi | ||
371 | fi | 374 | fi |
372 | 375 | ||
373 | ##################################################################################### | 376 | ##################################################################################### |
@@ -409,6 +412,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | @@ -409,6 +412,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | ||
409 | ( | 412 | ( |
410 | rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && | 413 | rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && |
411 | unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && chmod +w * && | 414 | unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && chmod +w * && |
415 | + patch -p0 < ../../3rdparty/patches/1.st.arm.patch && | ||
412 | patch -p0 < ../../3rdparty/patches/3.st.osx.kqueue.patch && | 416 | patch -p0 < ../../3rdparty/patches/3.st.osx.kqueue.patch && |
413 | patch -p0 < ../../3rdparty/patches/4.st.disable.examples.patch && | 417 | patch -p0 < ../../3rdparty/patches/4.st.disable.examples.patch && |
414 | make ${_ST_MAKE} ${_ST_EXTRA_CFLAGS} && | 418 | make ${_ST_MAKE} ${_ST_EXTRA_CFLAGS} && |
@@ -100,8 +100,7 @@ SRS_DISABLE_ALL=NO | @@ -100,8 +100,7 @@ SRS_DISABLE_ALL=NO | ||
100 | SRS_ENABLE_ALL=NO | 100 | SRS_ENABLE_ALL=NO |
101 | # | 101 | # |
102 | ################################################################ | 102 | ################################################################ |
103 | -# calc | ||
104 | -# whether embed cpu, arm/mips | 103 | +# whether cross build for embed cpu, arm/mips |
105 | SRS_EMBEDED_CPU=NO | 104 | SRS_EMBEDED_CPU=NO |
106 | 105 | ||
107 | ##################################################################################### | 106 | ##################################################################################### |
-
请 注册 或 登录 后发表评论