File tree 7 files changed +13
-16
lines changed
7 files changed +13
-16
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ function do_compile() {
57
57
if [ ! -d $MR_BUILD_SOURCE ]; then
58
58
echo " "
59
59
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 "
61
61
echo " !! Run init-any.sh ${LIB_NAME} first"
62
62
echo " "
63
63
exit 1
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ echo "[*] configure"
52
52
if [[ ! -d $MR_BUILD_SOURCE ]]; then
53
53
echo " "
54
54
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 "
56
56
echo " !! Run 'init-*.sh' first"
57
57
echo " "
58
58
exit 1
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ function do_compile() {
147
147
if [ ! -d $MR_BUILD_SOURCE ]; then
148
148
echo " "
149
149
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 "
151
151
echo " !! Run init-any.sh ${LIB_NAME} first"
152
152
echo " "
153
153
exit 1
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ echo "[*] configure"
53
53
if [[ ! -d $MR_BUILD_SOURCE ]]; then
54
54
echo " "
55
55
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 "
57
57
echo " !! Run 'init-*.sh' first"
58
58
echo " "
59
59
exit 1
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ echo "[*] configure"
55
55
if [[ ! -d $MR_BUILD_SOURCE ]]; then
56
56
echo " "
57
57
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 "
59
59
echo " !! Run 'init-*.sh' first"
60
60
echo " "
61
61
exit 1
Original file line number Diff line number Diff line change 50
50
# x86_64
51
51
export MR_ARCH=" $_MR_ARCH "
52
52
# 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
+
56
54
# 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} "
58
59
59
60
if [ -z " $ANDROID_NDK_HOME " ]; then
60
61
echo " You must define ANDROID_NDK_HOME before starting."
@@ -104,7 +105,6 @@ echo "MR_ARCH : [$MR_ARCH]"
104
105
echo " MR_TRIPLE : [$MR_TRIPLE ]"
105
106
echo " MR_ANDROID_API : [$MR_ANDROID_API ]"
106
107
echo " MR_ANDROID_NDK : [$MR_NDK_REL ]"
107
- echo " MR_BUILD_NAME : [$MR_BUILD_NAME ]"
108
108
echo " MR_BUILD_SOURCE : [$MR_BUILD_SOURCE ]"
109
109
echo " MR_BUILD_PREFIX : [$MR_BUILD_PREFIX ]"
110
110
echo " 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`
92
92
export MR_ARCH=" ${_MR_ARCH/ _simulator/ } "
93
93
export MR_FF_ARCH=" ${MR_ARCH} "
94
94
95
- # ffmpeg-x86_64
96
- export MR_BUILD_NAME=" ${REPO_DIR} -${_MR_ARCH} "
97
95
# 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 }"
101
99
# -arch x86_64 -mios-simulator-version-min=11.0
102
100
export MR_DEFAULT_CFLAGS=" -arch $MR_ARCH $MR_INIT_CFLAGS $DEPLOYMENT_TARGET -D__APPLE__"
103
101
104
102
echo " MR_ARCH : [$MR_ARCH ]"
105
- echo " MR_BUILD_NAME : [$MR_BUILD_NAME ]"
106
103
echo " MR_BUILD_SOURCE : [$MR_BUILD_SOURCE ]"
107
104
echo " MR_BUILD_PREFIX : [$MR_BUILD_PREFIX ]"
108
105
echo " MR_DEFAULT_CFLAGS: [$MR_DEFAULT_CFLAGS ]"
You can’t perform that action at this time.
0 commit comments