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

Merge branch 'bugfix/xcode-10-min-sdk'

This commit is contained in:
Davide De Rosa 2018-09-24 14:01:58 +02:00
parent ef7a3e4654 27564e9c8d
commit bcd0a9c5fc
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
.*.swp .*.swp
bin bin
src src
lib
include/openssl include/openssl
*.gz *.gz
*.framework *.framework

4
build-libssl.sh
View File

@ -28,8 +28,8 @@ set -u
DEFAULTVERSION="1.0.2l" DEFAULTVERSION="1.0.2l"
# Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build # Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build
DEFAULTARCHS="ios_x86_64 ios_i386 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64 mac_i386" DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64"
DEFAULTTARGETS="ios-sim-cross-x86_64 ios-sim-cross-i386 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 macos-i386" DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64"
# Minimum iOS/tvOS SDK version to build for # Minimum iOS/tvOS SDK version to build for
MACOS_MIN_SDK_VERSION="10.11" MACOS_MIN_SDK_VERSION="10.11"

6
create-openssl-framework.sh
View File

@ -62,10 +62,14 @@ if [ $FWTYPE == "dynamic" ]; then
CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk" CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk"
SDK="${CROSS_TOP}/SDKs/${CROSS_SDK}" SDK="${CROSS_TOP}/SDKs/${CROSS_SDK}"
if [[ $PLATFORM == "AppleTV"* ]]; then if [[ $PLATFORM == AppleTVSimulator* ]]; then
MIN_SDK="-tvos_simulator_version_min 9.0"
elif [[ $PLATFORM == AppleTV* ]]; then
MIN_SDK="-tvos_version_min 9.0" MIN_SDK="-tvos_version_min 9.0"
elif [[ $PLATFORM == MacOSX* ]]; then elif [[ $PLATFORM == MacOSX* ]]; then
MIN_SDK="-macosx_version_min 10.11" MIN_SDK="-macosx_version_min 10.11"
elif [[ $PLATFORM == iPhoneSimulator* ]]; then
MIN_SDK="-ios_simulator_version_min 8.0"
else else
MIN_SDK="-ios_version_min 8.0" MIN_SDK="-ios_version_min 8.0"
fi fi