Merge pull request #82 from omochi/fix/code-appearance
[01] Fix/code appearance
This commit is contained in:
commit
2d4370f0f0
|
@ -20,15 +20,15 @@
|
|||
#
|
||||
###########################################################################
|
||||
# Change values here #
|
||||
#
|
||||
# #
|
||||
VERSION="1.0.2e" #
|
||||
IOS_SDKVERSION=`xcrun -sdk iphoneos --show-sdk-version`
|
||||
IOS_SDKVERSION=`xcrun -sdk iphoneos --show-sdk-version` #
|
||||
TVOS_SDKVERSION=`xcrun -sdk appletvos --show-sdk-version` #
|
||||
CONFIG_OPTIONS=""
|
||||
CURL_OPTIONS=""
|
||||
CONFIG_OPTIONS="" #
|
||||
CURL_OPTIONS="" #
|
||||
|
||||
# To set "enable-ec_nistp_64_gcc_128" configuration for x64 archs set next variable to "true"
|
||||
ENABLE_EC_NISTP_64_GCC_128=""
|
||||
ENABLE_EC_NISTP_64_GCC_128="" #
|
||||
# #
|
||||
###########################################################################
|
||||
# #
|
||||
|
@ -94,7 +94,6 @@ mkdir -p "${CURRENTPATH}/lib"
|
|||
tar zxf openssl-${VERSION}.tar.gz -C "${CURRENTPATH}/src"
|
||||
cd "${CURRENTPATH}/src/openssl-${VERSION}"
|
||||
|
||||
|
||||
for ARCH in ${ARCHS}
|
||||
do
|
||||
if [[ "$ARCH" == tv* ]]; then
|
||||
|
@ -208,12 +207,30 @@ do
|
|||
done
|
||||
|
||||
echo "Build library for iOS..."
|
||||
lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-i386.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7s.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-arm64.sdk/lib/libssl.a -output ${CURRENTPATH}/lib/libssl.a
|
||||
lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-i386.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7s.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-arm64.sdk/lib/libcrypto.a -output ${CURRENTPATH}/lib/libcrypto.a
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-i386.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7s.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-arm64.sdk/lib/libssl.a \
|
||||
-output ${CURRENTPATH}/lib/libssl.a
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-i386.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7s.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-arm64.sdk/lib/libcrypto.a \
|
||||
-output ${CURRENTPATH}/lib/libcrypto.a
|
||||
|
||||
echo "Build library for tvOS..."
|
||||
lipo -create ${CURRENTPATH}/bin/AppleTVSimulator${TVOS_SDKVERSION}-x86_64.sdk/lib/libssl.a ${CURRENTPATH}/bin/AppleTVOS${TVOS_SDKVERSION}-arm64.sdk/lib/libssl.a -output ${CURRENTPATH}/lib/libssl-tvOS.a
|
||||
lipo -create ${CURRENTPATH}/bin/AppleTVSimulator${TVOS_SDKVERSION}-x86_64.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/AppleTVOS${TVOS_SDKVERSION}-arm64.sdk/lib/libcrypto.a -output ${CURRENTPATH}/lib/libcrypto-tvOS.a
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/AppleTVSimulator${TVOS_SDKVERSION}-x86_64.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/AppleTVOS${TVOS_SDKVERSION}-arm64.sdk/lib/libssl.a \
|
||||
-output ${CURRENTPATH}/lib/libssl-tvOS.a
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/AppleTVSimulator${TVOS_SDKVERSION}-x86_64.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/AppleTVOS${TVOS_SDKVERSION}-arm64.sdk/lib/libcrypto.a \
|
||||
-output ${CURRENTPATH}/lib/libcrypto-tvOS.a
|
||||
|
||||
mkdir -p ${CURRENTPATH}/include
|
||||
cp -R ${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/include/openssl ${CURRENTPATH}/include/
|
||||
|
|
Loading…
Reference in New Issue