diff --git a/scripts/function-apple.sh b/scripts/function-apple.sh
index 8ed878b..bc62a11 100755
--- a/scripts/function-apple.sh
+++ b/scripts/function-apple.sh
@@ -30,8 +30,8 @@ disable_ios_architecture_not_supported_on_detected_sdk_version() {
   case ${ARCH_NAME} in
   armv7 | armv7s | i386)
 
-    # SUPPORTED UNTIL IOS SDK 10
-    if [[ $2 == 11* ]] || [[ $2 == 12* ]] || [[ $2 == 13* ]] || [[ $2 == 14* ]]; then
+    # SUPPORTED UNTIL IOS SDK 10.3.1
+    if [[ $(echo "$2 > 10.4" | bc) -eq 1 ]]; then
       local SUPPORTED=0
     else
       local SUPPORTED=1
@@ -39,8 +39,8 @@ disable_ios_architecture_not_supported_on_detected_sdk_version() {
     ;;
   arm64e)
 
-    # INTRODUCED IN IOS SDK 10
-    if [[ $2 == 10* ]] || [[ $2 == 11* ]] || [[ $2 == 12* ]] || [[ $2 == 13* ]] || [[ $2 == 14* ]]; then
+    # INTRODUCED IN IOS SDK 10.1
+    if [[ $(echo "$2 > 10" | bc) -eq 1 ]]; then
       local SUPPORTED=1
     else
       local SUPPORTED=0
@@ -49,7 +49,7 @@ disable_ios_architecture_not_supported_on_detected_sdk_version() {
   x86-64-mac-catalyst)
 
     # INTRODUCED IN IOS SDK 13
-    if [[ $2 == 13* ]] || [[ $2 == 14* ]]; then
+    if [[ $(echo "$2 > 12.4" | bc) -eq 1 ]]; then
       local SUPPORTED=1
     else
       local SUPPORTED=0
@@ -58,7 +58,7 @@ disable_ios_architecture_not_supported_on_detected_sdk_version() {
   arm64-*)
 
     # INTRODUCED IN IOS SDK 14
-    if [[ $2 == 14* ]]; then
+    if [[ $(echo "$2 > 13.7" | bc) -eq 1 ]]; then
       local SUPPORTED=1
     else
       local SUPPORTED=0
@@ -88,7 +88,7 @@ disable_tvos_architecture_not_supported_on_detected_sdk_version() {
   arm64-simulator)
 
     # INTRODUCED IN TVOS SDK 14
-    if [[ $2 == 14* ]]; then
+    if [[ $(echo "$2 > 13.4" | bc) -eq 1 ]]; then
       local SUPPORTED=1
     else
       local SUPPORTED=0
@@ -118,7 +118,7 @@ disable_macos_architecture_not_supported_on_detected_sdk_version() {
   arm64)
 
     # INTRODUCED IN MACOS SDK 11
-    if [[ $2 == 11* ]]; then
+    if [[ $(echo "$2 > 10.16" | bc) -eq 1 ]]; then
       local SUPPORTED=1
     else
       local SUPPORTED=0
diff --git a/scripts/function-ios.sh b/scripts/function-ios.sh
index a293123..7379070 100755
--- a/scripts/function-ios.sh
+++ b/scripts/function-ios.sh
@@ -119,13 +119,13 @@ get_arch_specific_cflags() {
     echo "-arch arm64e -target $(get_target) -march=armv8.3-a+crc+crypto -mcpu=generic -DFFMPEG_KIT_ARM64E"
     ;;
   i386)
-    echo "-arch i386 -target $(get_target) -march=i386 -mtune=intel -mssse3 -mfpmath=sse -m32 -DFFMPEG_KIT_I386"
+    echo "-arch i386 -target $(get_target) -march=i386 -mssse3 -mfpmath=sse -m32 -DFFMPEG_KIT_I386"
     ;;
   x86-64)
-    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DFFMPEG_KIT_X86_64"
+    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -DFFMPEG_KIT_X86_64"
     ;;
   x86-64-mac-catalyst)
-    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DFFMPEG_KIT_X86_64_MAC_CATALYST -isysroot ${SDK_PATH} -isystem ${SDK_PATH}/System/iOSSupport/usr/include -iframework ${SDK_PATH}/System/iOSSupport/System/Library/Frameworks"
+    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -DFFMPEG_KIT_X86_64_MAC_CATALYST -isysroot ${SDK_PATH} -isystem ${SDK_PATH}/System/iOSSupport/usr/include -iframework ${SDK_PATH}/System/iOSSupport/System/Library/Frameworks"
     ;;
   esac
 }
diff --git a/scripts/function-macos.sh b/scripts/function-macos.sh
index cd6ea26..1c2b30b 100755
--- a/scripts/function-macos.sh
+++ b/scripts/function-macos.sh
@@ -84,7 +84,7 @@ get_arch_specific_cflags() {
     echo "-arch arm64 -target $(get_target) -march=armv8-a+crc+crypto -mcpu=generic -DFFMPEG_KIT_ARM64"
     ;;
   x86-64)
-    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DFFMPEG_KIT_X86_64"
+    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -DFFMPEG_KIT_X86_64"
     ;;
   esac
 }
diff --git a/scripts/function-tvos.sh b/scripts/function-tvos.sh
index f198cc8..fc2fb68 100755
--- a/scripts/function-tvos.sh
+++ b/scripts/function-tvos.sh
@@ -90,7 +90,7 @@ get_arch_specific_cflags() {
     echo "-arch arm64 -target $(get_target) -march=armv8-a+crc+crypto -mcpu=generic -DFFMPEG_KIT_ARM64_SIMULATOR"
     ;;
   x86-64)
-    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DFFMPEG_KIT_X86_64"
+    echo "-arch x86_64 -target $(get_target) -march=x86-64 -msse4.2 -mpopcnt -m64 -DFFMPEG_KIT_X86_64"
     ;;
   esac
 }