From ae01db54bcbe0027410f2ffbe1d683da589b3269 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Wed, 24 Aug 2022 02:44:35 +0100 Subject: [PATCH] remove references of universal libraries from the build scripts --- ios.sh | 4 ++-- macos.sh | 4 ++-- scripts/function-ios.sh | 4 ++-- scripts/function-macos.sh | 4 ++-- scripts/function-tvos.sh | 4 ++-- tvos.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ios.sh b/ios.sh index 09c5aa1..b1a1679 100755 --- a/ios.sh +++ b/ios.sh @@ -283,7 +283,7 @@ if [[ ${NO_FRAMEWORK} -ne 1 ]]; then build_apple_architecture_variant_strings if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then - echo -e -n "\nCreating universal libraries and xcframeworks under prebuilt: " + echo -e -n "\nCreating xcframeworks under prebuilt: " create_universal_libraries_for_ios_xcframeworks @@ -291,7 +291,7 @@ if [[ ${NO_FRAMEWORK} -ne 1 ]]; then create_ios_xcframeworks else - echo -e -n "\nCreating universal libraries and frameworks under prebuilt: " + echo -e -n "\nCreating frameworks under prebuilt: " create_universal_libraries_for_ios_default_frameworks diff --git a/macos.sh b/macos.sh index dec62c8..3f67254 100755 --- a/macos.sh +++ b/macos.sh @@ -252,7 +252,7 @@ if [[ ${NO_FRAMEWORK} -ne 1 ]]; then build_apple_architecture_variant_strings if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then - echo -e -n "\nCreating universal libraries and xcframeworks under prebuilt: " + echo -e -n "\nCreating xcframeworks under prebuilt: " create_universal_libraries_for_macos_xcframeworks @@ -260,7 +260,7 @@ if [[ ${NO_FRAMEWORK} -ne 1 ]]; then create_macos_xcframeworks else - echo -e -n "\nCreating universal libraries and frameworks under prebuilt: " + echo -e -n "\nCreating frameworks under prebuilt: " create_universal_libraries_for_macos_default_frameworks diff --git a/scripts/function-ios.sh b/scripts/function-ios.sh index e5cda43..3da4355 100755 --- a/scripts/function-ios.sh +++ b/scripts/function-ios.sh @@ -27,7 +27,7 @@ libraries are created under the prebuilt folder.\n" echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" - display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles and universal libraries" " -l, --lts build lts packages to support sdk 10+ devices" " --target=ios sdk version\t\t\toverride minimum deployment target [12.1]" " --mac-catalyst-target=ios sdk version\toverride minimum deployment target for mac catalyst [14.0]" + display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10+ devices" " --target=ios sdk version\t\t\toverride minimum deployment target [12.1]" " --mac-catalyst-target=ios sdk version\toverride minimum deployment target for mac catalyst [14.0]" display_help_licensing echo -e "Architectures:" @@ -57,7 +57,7 @@ libraries are created under the prebuilt folder.\n" if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then display_help_advanced_options " --no-framework\t\tdo not build xcframework bundles [no]" else - display_help_advanced_options " --no-framework\t\tdo not build framework bundles and universal libraries [no]" + display_help_advanced_options " --no-framework\t\tdo not build framework bundles [no]" fi } diff --git a/scripts/function-macos.sh b/scripts/function-macos.sh index 8683674..d64ed03 100755 --- a/scripts/function-macos.sh +++ b/scripts/function-macos.sh @@ -19,7 +19,7 @@ When compilation ends, libraries are created under the prebuilt folder.\n" echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" - display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles and universal libraries" " -l, --lts build lts packages to support sdk 10.12+ devices" " --target=macos sdk version\toverride minimum deployment target [10.15]" + display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10.12+ devices" " --target=macos sdk version\toverride minimum deployment target [10.15]" display_help_licensing echo -e "Architectures:" @@ -45,7 +45,7 @@ When compilation ends, libraries are created under the prebuilt folder.\n" if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then display_help_advanced_options " --no-framework\t\tdo not build xcframework bundles [no]" else - display_help_advanced_options " --no-framework\t\tdo not build framework bundles and universal libraries [no]" + display_help_advanced_options " --no-framework\t\tdo not build framework bundles [no]" fi } diff --git a/scripts/function-tvos.sh b/scripts/function-tvos.sh index 6016b42..bb78acc 100755 --- a/scripts/function-tvos.sh +++ b/scripts/function-tvos.sh @@ -20,7 +20,7 @@ set explicitly. When compilation ends, libraries are created under the prebuilt echo -e "Usage: ./$COMMAND [OPTION]...\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" - display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles and universal libraries" " -l, --lts build lts packages to support sdk 10.0+ devices" " --target=tvos sdk version\toverride minimum deployment target [11.0]" + display_help_options " -x, --xcframework\t\tbuild xcframework bundles instead of framework bundles" " -l, --lts build lts packages to support sdk 10.0+ devices" " --target=tvos sdk version\toverride minimum deployment target [11.0]" display_help_licensing echo -e "Architectures:" @@ -45,7 +45,7 @@ set explicitly. When compilation ends, libraries are created under the prebuilt if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then display_help_advanced_options " --no-framework\t\tdo not build xcframework bundles [no]" else - display_help_advanced_options " --no-framework\t\tdo not build framework bundles and universal libraries [no]" + display_help_advanced_options " --no-framework\t\tdo not build framework bundles [no]" fi } diff --git a/tvos.sh b/tvos.sh index aefecde..38c32ea 100755 --- a/tvos.sh +++ b/tvos.sh @@ -263,7 +263,7 @@ if [[ ${NO_FRAMEWORK} -ne 1 ]]; then build_apple_architecture_variant_strings if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]]; then - echo -e -n "\nCreating universal libraries and xcframeworks under prebuilt: " + echo -e -n "\nCreating xcframeworks under prebuilt: " create_universal_libraries_for_tvos_xcframeworks @@ -271,7 +271,7 @@ if [[ ${NO_FRAMEWORK} -ne 1 ]]; then create_tvos_xcframeworks else - echo -e -n "\nCreating universal libraries and frameworks under prebuilt: " + echo -e -n "\nCreating frameworks under prebuilt: " create_universal_libraries_for_tvos_default_frameworks