Skip to content

Commit c008fb6

Browse files
committed
install cmd drop --skip-fmwk and add --fmwk option
1 parent c360302 commit c008fb6

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/onestep.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ function compile_ios_platform
5151
local log_file="$DIST_DIR/ios-compile-log-$RELEASE_VERSION.md"
5252

5353
if [[ $VERBOSE ]];then
54-
./main.sh compile -p ios -c build -l ${LIB_NAME} --skip-fmwk 2>&1 | tee -a "$log_file"
54+
./main.sh compile -p ios -c build -l ${LIB_NAME} 2>&1 | tee -a "$log_file"
5555
else
56-
./main.sh compile -p ios -c build -l ${LIB_NAME} --skip-fmwk >> "$log_file" 2>&1
56+
./main.sh compile -p ios -c build -l ${LIB_NAME} >> "$log_file" 2>&1
5757
fi
5858

5959
cd build/product/ios/universal
@@ -71,9 +71,9 @@ function compile_macos_platform
7171
local log_file="$DIST_DIR/macos-compile-log-$RELEASE_VERSION.md"
7272

7373
if [[ $VERBOSE ]];then
74-
./main.sh compile -p macos -c build -l ${LIB_NAME} --skip-fmwk 2>&1 | tee -a "$log_file"
74+
./main.sh compile -p macos -c build -l ${LIB_NAME} 2>&1 | tee -a "$log_file"
7575
else
76-
./main.sh compile -p macos -c build -l ${LIB_NAME} --skip-fmwk >> "$log_file" 2>&1
76+
./main.sh compile -p macos -c build -l ${LIB_NAME} >> "$log_file" 2>&1
7777
fi
7878

7979
cd build/product/macos/universal
@@ -88,9 +88,9 @@ function compile_tvos_platform
8888
local log_file="$DIST_DIR/android-compile-log-$RELEASE_VERSION.md"
8989

9090
if [[ $VERBOSE ]];then
91-
./main.sh compile -p tvos -c build -l ${LIB_NAME} --skip-fmwk 2>&1 | tee -a "$log_file"
91+
./main.sh compile -p tvos -c build -l ${LIB_NAME} 2>&1 | tee -a "$log_file"
9292
else
93-
./main.sh compile -p tvos -c build -l ${LIB_NAME} --skip-fmwk >> "$log_file" 2>&1
93+
./main.sh compile -p tvos -c build -l ${LIB_NAME} >> "$log_file" 2>&1
9494
fi
9595

9696
cd build/product/tvos/universal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ The following code demonstrates how to compile FFmpeg 7 for the iOS platform:
109109
./main.sh install -p ios -l ffmpeg7
110110
# other choice (you must know ffmpeg7's dependent lib name)
111111
./main.sh install -p ios -l "openssl3 opus bluray dav1d dvdnav uavs3d smb2"
112-
# Compile FFmpeg7 for the arm64 architecture on iOS
113-
./main.sh compile -p ios -a arm64 -l ffmepg7 --skip-fmwk
112+
# Compile FFmpeg7 for the arm64 architecture on iOS with xcframework
113+
./main.sh compile -p ios -a arm64 -l ffmepg7 --fmwk
114114
```
115115

116116
The order of these parameters does not matter; they can be arranged in any sequence.

do-compile/apple/any.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ do_lipo_all() {
106106
done
107107

108108
echo '----------------------'
109-
if [[ "$MR_SKIP_MAKE_XCFRAMEWORK" ]]; then
110-
echo "⚠️ skip make xcframework"
111-
else
109+
if [[ "$MR_MAKE_XCFRAMEWORK" ]]; then
112110
echo '[*] make xcframework'
113111
do_make_xcframework
112+
else
113+
echo "⚠️ skip make xcframework"
114114
fi
115115
echo '----------------------'
116116
echo

tools/parse-arguments.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ OPTIONS:
6666
-j Force number of cores to be used
6767
--help Show help banner of compile command
6868
--debug Enable debug mode (disable by default)
69-
--skip-fmwk Skip make xcframework(apple platform only)
69+
--fmwk Make xcframework(apple platform only)
7070
EOF
7171
}
7272

@@ -184,8 +184,8 @@ while [[ $# -gt 0 ]]; do
184184
--skip-ff-patches)
185185
export SKIP_FFMPEG_PATHCHES=1
186186
;;
187-
--skip-fmwk)
188-
export MR_SKIP_MAKE_XCFRAMEWORK=1
187+
--fmwk)
188+
export MR_MAKE_XCFRAMEWORK=1
189189
;;
190190
-correct-pc)
191191
shift
@@ -282,7 +282,7 @@ echo "MR_DEBUG : [$MR_DEBUG]"
282282
echo "MR_INIT_CFLAGS : [$MR_INIT_CFLAGS]"
283283
echo "SKIP_PULL_BASE : [$SKIP_PULL_BASE]"
284284
echo "SKIP_FFMPEG_PATHCHES : [$SKIP_FFMPEG_PATHCHES]"
285-
echo "MR_SKIP_MAKE_XCFRAMEWORK" : [$MR_SKIP_MAKE_XCFRAMEWORK]
285+
echo "MR_MAKE_XCFRAMEWORK" : [$MR_MAKE_XCFRAMEWORK]
286286
[[ ${#MR_UNKNOWN_OPTIONS[@]} -gt 0 ]] && echo "MR_UNKNOWN_OPTIONS : [${MR_UNKNOWN_OPTIONS[*]}]"
287287
[[ -n $MR_PC_FILE_DIR ]] && echo "MR_PC_FILE_DIR : [$MR_PC_FILE_DIR]"
288288

0 commit comments

Comments
 (0)