winlin

Merge branch 'srs.master'

@@ -239,7 +239,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -239,7 +239,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
239 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 239 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
240 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && 240 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
241 patch -p0 < ../../3rdparty/patches/1.st.arm.patch && 241 patch -p0 < ../../3rdparty/patches/1.st.arm.patch &&
242 - make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} EXTRA_CFLAGS="-DMD_HAVE_EPOLL" ${_ST_MAKE} && 242 + make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} \
  243 + EXTRA_CFLAGS="-DMD_HAVE_EPOLL" ${_ST_MAKE} &&
243 cd .. && rm -rf st && ln -sf st-1.9/obj st && 244 cd .. && rm -rf st && ln -sf st-1.9/obj st &&
244 cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp 245 cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp
245 ) 246 )