Merge remote-tracking branch 'upstream/master'

Author: Xi Shen

.gitignore

@@ -8,3 +8,4 @@ tools/*-android-toolchain
 tools/curl*
 tools/openssl*
 tools/protobuf*
+output/

README.md

@@ -12,6 +12,10 @@
 
 ## English
 
+## Downloads
+
+If you do not want to build it by yourself, you could download our prebuilt library from [there](https://github.com/leenjewel/openssl_for_ios_and_android/releases/tag/20170105)
+
 ## OpenSSL Version
 
 This a static library compile from openssl and cURL for iOS and Android.
@@ -193,6 +197,10 @@ target_link_libraries( # Specifies the target library.
 
 后来又加入了适用于 iOS 平台和 Android 平台且支持 SSL 的 cURL 静态链接库。基于 curl-7.47.1 版本编译生成。
 
+## 下载
+
+如果你不想自己构建，那么你可以使用我们已经预先构建好的版本，[请在这里下载](https://github.com/leenjewel/openssl_for_ios_and_android/releases/tag/20170105)
+
 ## 在 iOS 工程中使用
 
 将 `lib/libcrypto.a` 和 `lib/libssl.a` 还有 `lib/libcurl.a` 三个静态链接库文件拷贝到你的 iOS 工程下面合适的位置。

tools/build-openssl4ios.sh

@@ -31,7 +31,7 @@ PLATFORMS=("iPhoneOS" "iPhoneOS" "iPhoneOS" "iPhoneSimulator" "iPhoneSimulator")
 DEVELOPER=`xcode-select -print-path`
 SDK_VERSION=""10.2""
 LIB_NAME="openssl-1.1.0c"
-LIB_DEST_DIR="lib"
+LIB_DEST_DIR="${pwd_path}/../output/ios/openssl-ios-universal"
 HEADER_DEST_DIR="include"
 rm -rf "${HEADER_DEST_DIR}" "${LIB_DEST_DIR}" "${LIB_NAME}"
 
@@ -56,7 +56,7 @@ configure_make()
    export TOOLS="${DEVELOPER}"
    export CC="${TOOLS}/usr/bin/gcc -arch ${ARCH}"
 
-   PREFIX_DIR="${pwd_path}/openssl-ios-${ARCH}"
+   PREFIX_DIR="${pwd_path}/../output/ios/openssl-ios-${ARCH}"
    if [ -d "${PREFIX_DIR}" ]; then
        rm -fr "${PREFIX_DIR}"
    fi
@@ -89,7 +89,7 @@ done
 create_lib()
 {
    LIB_SRC=$1; LIB_DST=$2;
-   LIB_PATHS=( "${ARCHS[@]/#/${pwd_path}/openssl-ios-}" )
+   LIB_PATHS=( "${ARCHS[@]/#/${pwd_path}/../output/ios/openssl-ios-}" )
    LIB_PATHS=( "${LIB_PATHS[@]/%//lib/${LIB_SRC}}" )
    lipo ${LIB_PATHS[@]} -create -output "${LIB_DST}"
 }