passepartoutvpn
/
openssl-apple
mirror of https://github.com/passepartoutvpn/openssl-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add arm64 target for Apple TV Simulator (#58)

This commit is contained in:
Davide De Rosa 2023-12-16 12:13:35 +01:00 committed by GitHub
parent 4837f567f5
commit 7d9804a8ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-libssl.sh
View File

@ -33,7 +33,7 @@ ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e
macos64-x86_64 macos64-arm64 macos64-x86_64 macos64-arm64
mac-catalyst-x86_64 mac-catalyst-arm64 mac-catalyst-x86_64 mac-catalyst-arm64
watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64 watchos-sim-cross-i386 watchos-sim-cross-arm64 watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64 watchos-sim-cross-i386 watchos-sim-cross-arm64
tvos-sim-cross-x86_64 tvos64-cross-arm64 tvos-sim-cross-x86_64 tvos-sim-cross-arm64 tvos-cross-arm64
TARGETS` TARGETS`
# Minimum iOS/tvOS SDK version to build for # Minimum iOS/tvOS SDK version to build for
@ -613,6 +613,9 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
*_tvos_arm64.h) *_tvos_arm64.h)
DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64" DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
;; ;;
*_tvos_sim_arm64.h)
DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_ARM64"
;;
*_tvos_sim_x86_64.h) *_tvos_sim_x86_64.h)
DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64" DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
;; ;;

7
config/20-all-platforms.conf
View File

@ -134,7 +134,7 @@ my %targets = ();
## Apple TV ## Apple TV
# Device # Device
"tvos64-cross-arm64" => { "tvos-cross-arm64" => {
inherit_from => [ "darwin-common", "tvos-cross-base" ], inherit_from => [ "darwin-common", "tvos-cross-base" ],
cflags => add("-arch arm64"), cflags => add("-arch arm64"),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
@ -142,6 +142,11 @@ my %targets = ();
sys_id => "tvOS", sys_id => "tvOS",
}, },
# Simulator # Simulator
"tvos-sim-cross-arm64" => {
inherit_from => [ "darwin64-arm64", "tvos-cross-base" ],
cflags => add("-target arm64-apple-tvos12.0-simulator"),
sys_id => "tvOS",
},
"tvos-sim-cross-x86_64" => { "tvos-sim-cross-x86_64" => {
inherit_from => [ "darwin64-x86_64-cc", "tvos-cross-base" ], inherit_from => [ "darwin64-x86_64-cc", "tvos-cross-base" ],
sys_id => "tvOS", sys_id => "tvOS",

2
scripts/build-loop-targets.sh
View File

@ -57,7 +57,7 @@ do
PLATFORM="WatchOS" PLATFORM="WatchOS"
elif [[ "${TARGET}" == "tvos-sim-cross-"* ]]; then elif [[ "${TARGET}" == "tvos-sim-cross-"* ]]; then
PLATFORM="AppleTVSimulator" PLATFORM="AppleTVSimulator"
elif [[ "${TARGET}" == "tvos64-cross-"* ]]; then elif [[ "${TARGET}" == "tvos-cross-"* ]]; then
PLATFORM="AppleTVOS" PLATFORM="AppleTVOS"
elif [[ "${TARGET}" == "ios-sim-cross-"* ]]; then elif [[ "${TARGET}" == "ios-sim-cross-"* ]]; then
PLATFORM="iPhoneSimulator" PLATFORM="iPhoneSimulator"