From f0a2fe235fcec68f8bc4d72dfbdbda5d247c818a Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 16 Apr 2014 15:09:31 +0800 Subject: [PATCH] refine scripts, use configure presets. --- trunk/scripts/build.sh | 2 +- trunk/scripts/package.sh | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/trunk/scripts/build.sh b/trunk/scripts/build.sh index fe610a8b3..cae2241c7 100755 --- a/trunk/scripts/build.sh +++ b/trunk/scripts/build.sh @@ -4,7 +4,7 @@ if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; # step 1: build srs echo "编译SRS" -./configure --with-ssl --with-hls --with-http-server --with-http-api --with-ingest --with-transcode --with-http-callback && make +./configure --x86-x64 && make ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：编译SRS失败"; exit $ret; fi echo "编译SRS成功" diff --git a/trunk/scripts/package.sh b/trunk/scripts/package.sh index c748a0584..bda5af35f 100755 --- a/trunk/scripts/package.sh +++ b/trunk/scripts/package.sh @@ -45,7 +45,7 @@ if [ $help = yes ]; then --help print this message --arm configure with arm and make srs. use arm tools to get info. - --no-build donot build srs, user has builded. only make install. + --no-build donot build srs, user has builded(./configure --pi && make). only make install. END exit 0 fi @@ -89,15 +89,12 @@ if [ $DO_BUILD = YES ]; then if [ $ARM = YES ]; then ( cd $work_dir && - ./configure --with-ssl --with-arm-ubuntu12 --prefix=$INSTALL && make + ./configure --arm --prefix=$INSTALL && make ) >> $log 2>&1 else ( cd $work_dir && - ./configure --with-ssl --with-hls \ - --with-http-server --with-http-api --with-http-callback \ - --with-ingest --with-transcode \ - --prefix=$INSTALL && make + ./configure --x86-x64 --prefix=$INSTALL && make ) >> $log 2>&1 fi ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "build srs failed"; exit $ret; fi