Skip to content

Commit

Permalink
Bump the iOS minimum version to 13 on native builds
Browse files Browse the repository at this point in the history
Our actual framework targets 14, so this won't have any effect on clients.

This also allows us to quit targeting armv7.

And cut out arm64e as well. Let's keep our release lean.

Diffs=
05e1afaf3 Bump the iOS minimum version to 13 on native builds (#5989)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
  • Loading branch information
csmartdalton and csmartdalton committed Sep 15, 2023
1 parent 6b42846 commit 98adbc4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0dcbdade49885fcae4de304972ae37f6283f19d1
05e1afaf3419e5c5c46a747690c5591174801de6
4 changes: 2 additions & 2 deletions build/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ do
filter {'system:ios', 'options:variant=system'}
do
buildoptions {
'-mios-version-min=10.0 -fembed-bitcode -arch armv7 -arch arm64 -arch arm64e -isysroot ' ..
'-mios-version-min=13.0 -fembed-bitcode -arch arm64 -isysroot ' ..
(os.getenv('IOS_SYSROOT') or '')
}
end

filter {'system:ios', 'options:variant=emulator'}
do
buildoptions {
'-mios-version-min=10.0 -arch arm64 -arch x86_64 -arch i386 -isysroot ' .. (os.getenv('IOS_SYSROOT') or '')
'-mios-version-min=13.0 -arch arm64 -arch x86_64 -isysroot ' .. (os.getenv('IOS_SYSROOT') or '')
}
targetdir '%{cfg.system}_sim/bin/%{cfg.buildcfg}'
objdir '%{cfg.system}_sim/obj/%{cfg.buildcfg}'
Expand Down
4 changes: 2 additions & 2 deletions dependencies/premake5_harfbuzz.lua
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,15 @@ do
filter {'system:ios', 'options:variant=system'}
do
buildoptions {
'-mios-version-min=10.0 -fembed-bitcode -arch armv7 -arch arm64 -arch arm64e -isysroot ' ..
'-mios-version-min=13.0 -fembed-bitcode -arch arm64 -isysroot ' ..
(os.getenv('IOS_SYSROOT') or '')
}
end

filter {'system:ios', 'options:variant=emulator'}
do
buildoptions {
'-mios-version-min=10.0 -arch arm64 -arch x86_64 -arch i386 -isysroot ' .. (os.getenv('IOS_SYSROOT') or '')
'-mios-version-min=13.0 -arch arm64 -arch x86_64 -isysroot ' .. (os.getenv('IOS_SYSROOT') or '')
}
targetdir '%{cfg.system}_sim/cache/bin/%{cfg.buildcfg}'
objdir '%{cfg.system}_sim/cache/obj/%{cfg.buildcfg}'
Expand Down
4 changes: 2 additions & 2 deletions dependencies/premake5_sheenbidi.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ do
filter {'system:ios', 'options:variant=system'}
do
buildoptions {
'-mios-version-min=10.0 -fembed-bitcode -arch armv7 -arch arm64 -arch arm64e -isysroot ' ..
'-mios-version-min=13.0 -fembed-bitcode -arch arm64 -isysroot ' ..
(os.getenv('IOS_SYSROOT') or '')
}
end

filter {'system:ios', 'options:variant=emulator'}
do
buildoptions {
'-mios-version-min=10.0 -arch arm64 -arch x86_64 -arch i386 -isysroot ' .. (os.getenv('IOS_SYSROOT') or '')
'-mios-version-min=13.0 -arch arm64 -arch x86_64 -isysroot ' .. (os.getenv('IOS_SYSROOT') or '')
}
targetdir '%{cfg.system}_sim/cache/bin/%{cfg.buildcfg}'
objdir '%{cfg.system}_sim/cache/obj/%{cfg.buildcfg}'
Expand Down
4 changes: 2 additions & 2 deletions skia/renderer/build/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ do
filter {'system:ios', 'options:variant=system'}
do
buildoptions {
'-mios-version-min=10.0 -fembed-bitcode -arch armv7 -arch arm64 -arch arm64e -isysroot ' ..
'-mios-version-min=13.0 -fembed-bitcode -arch arm64 -isysroot ' ..
(os.getenv('IOS_SYSROOT') or '')
}
end

filter {'system:ios', 'options:variant=emulator'}
do
buildoptions {
'--target=arm64-apple-ios12.0.0-simulator -mios-version-min=12.0 -arch x86_64 -arch arm64 -isysroot ' ..
'--target=arm64-apple-ios13.0.0-simulator -mios-version-min=13.0 -arch x86_64 -arch arm64 -isysroot ' ..
(os.getenv('IOS_SYSROOT') or '')
}
targetdir '%{cfg.system}_sim/bin/%{cfg.buildcfg}'
Expand Down

0 comments on commit 98adbc4

Please sign in to comment.