File tree Expand file tree Collapse file tree 7 files changed +13
-16
lines changed
Expand file tree Collapse file tree 7 files changed +13
-16
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ function do_compile() {
5757 if [ ! -d $MR_BUILD_SOURCE ]; then
5858 echo " "
5959 echo " !! ERROR"
60- echo " !! Can not find $MR_BUILD_SOURCE directory for $MR_BUILD_NAME "
60+ echo " !! Can not find lib source: $MR_BUILD_SOURCE "
6161 echo " !! Run init-any.sh ${LIB_NAME} first"
6262 echo " "
6363 exit 1
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ echo "[*] configure"
5252if [[ ! -d $MR_BUILD_SOURCE ]]; then
5353 echo " "
5454 echo " !! ERROR"
55- echo " !! Can not find $MR_BUILD_SOURCE directory for $MR_BUILD_NAME "
55+ echo " !! Can not find lib source: $MR_BUILD_SOURCE "
5656 echo " !! Run 'init-*.sh' first"
5757 echo " "
5858 exit 1
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ function do_compile() {
147147 if [ ! -d $MR_BUILD_SOURCE ]; then
148148 echo " "
149149 echo " !! ERROR"
150- echo " !! Can not find $MR_BUILD_SOURCE directory for $MR_BUILD_NAME "
150+ echo " !! Can not find lib source: $MR_BUILD_SOURCE "
151151 echo " !! Run init-any.sh ${LIB_NAME} first"
152152 echo " "
153153 exit 1
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ echo "[*] configure"
5353if [[ ! -d $MR_BUILD_SOURCE ]]; then
5454 echo " "
5555 echo " !! ERROR"
56- echo " !! Can not find $MR_BUILD_SOURCE directory for $MR_BUILD_NAME "
56+ echo " !! Can not find lib source: $MR_BUILD_SOURCE "
5757 echo " !! Run 'init-*.sh' first"
5858 echo " "
5959 exit 1
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ echo "[*] configure"
5555if [[ ! -d $MR_BUILD_SOURCE ]]; then
5656 echo " "
5757 echo " !! ERROR"
58- echo " !! Can not find $MR_BUILD_SOURCE directory for $MR_BUILD_NAME "
58+ echo " !! Can not find lib source: $MR_BUILD_SOURCE "
5959 echo " !! Run 'init-*.sh' first"
6060 echo " "
6161 exit 1
Original file line number Diff line number Diff line change 5050# x86_64
5151export MR_ARCH=" $_MR_ARCH "
5252# openssl-armv7a
53- export MR_BUILD_NAME=" ${REPO_DIR} -${_MR_ARCH} "
54- # android/ffmpeg-x86_64
55- export MR_BUILD_SOURCE=" ${MR_SRC_ROOT} /${MR_BUILD_NAME} "
53+
5654# android/ffmpeg-x86_64
57- export MR_BUILD_PREFIX=" ${MR_PRODUCT_ROOT} /${MR_BUILD_NAME} "
55+ export MR_BUILD_SOURCE=" ${MR_SRC_ROOT} /${REPO_DIR} -${_MR_ARCH} "
56+ # android/fftutorial-x86_64
57+ LIB_NAME
58+ export MR_BUILD_PREFIX=" ${MR_PRODUCT_ROOT} /${LIB_NAME} -${_MR_ARCH} "
5859
5960if [ -z " $ANDROID_NDK_HOME " ]; then
6061 echo " You must define ANDROID_NDK_HOME before starting."
@@ -104,7 +105,6 @@ echo "MR_ARCH : [$MR_ARCH]"
104105echo " MR_TRIPLE : [$MR_TRIPLE ]"
105106echo " MR_ANDROID_API : [$MR_ANDROID_API ]"
106107echo " MR_ANDROID_NDK : [$MR_NDK_REL ]"
107- echo " MR_BUILD_NAME : [$MR_BUILD_NAME ]"
108108echo " MR_BUILD_SOURCE : [$MR_BUILD_SOURCE ]"
109109echo " MR_BUILD_PREFIX : [$MR_BUILD_PREFIX ]"
110110echo " MR_DEFAULT_CFLAGS : [$MR_DEFAULT_CFLAGS ]"
Original file line number Diff line number Diff line change @@ -92,17 +92,14 @@ export MR_SYS_ROOT=`xcrun -sdk $XCRUN_SDK --show-sdk-path`
9292export MR_ARCH=" ${_MR_ARCH/ _simulator/ } "
9393export MR_FF_ARCH=" ${MR_ARCH} "
9494
95- # ffmpeg-x86_64
96- export MR_BUILD_NAME=" ${REPO_DIR} -${_MR_ARCH} "
9795# ios/ffmpeg-x86_64
98- export MR_BUILD_SOURCE=" ${MR_SRC_ROOT} /${MR_BUILD_NAME } "
99- # ios/ffmpeg -x86_64
100- export MR_BUILD_PREFIX=" ${MR_PRODUCT_ROOT} /${MR_BUILD_NAME } "
96+ export MR_BUILD_SOURCE=" ${MR_SRC_ROOT} /${REPO_DIR} - ${_MR_ARCH }"
97+ # ios/fftutorial -x86_64
98+ export MR_BUILD_PREFIX=" ${MR_PRODUCT_ROOT} /${LIB_NAME} - ${_MR_ARCH }"
10199# -arch x86_64 -mios-simulator-version-min=11.0
102100export MR_DEFAULT_CFLAGS=" -arch $MR_ARCH $MR_INIT_CFLAGS $DEPLOYMENT_TARGET -D__APPLE__"
103101
104102echo " MR_ARCH : [$MR_ARCH ]"
105- echo " MR_BUILD_NAME : [$MR_BUILD_NAME ]"
106103echo " MR_BUILD_SOURCE : [$MR_BUILD_SOURCE ]"
107104echo " MR_BUILD_PREFIX : [$MR_BUILD_PREFIX ]"
108105echo " MR_DEFAULT_CFLAGS: [$MR_DEFAULT_CFLAGS ]"
You can’t perform that action at this time.
0 commit comments