update prebuilt libs

5minlab · Nov 1, 2019 · 196b7de · 196b7de
1 parent a6cb573
commit 196b7de
Show file tree

Hide file tree

Showing 28 changed files with 9 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,8 +19,9 @@
 **/Makefile
 **/pkgconfig
 **/prebuilt/**/share
+**/prebuilt/**/cmake
 build/**/build
 Library
 Logs
 obj
-Temp
+Temp
diff --git a/Assets/curl-unity/Plugins/android/arm64-v8a/libcurl.so b/Assets/curl-unity/Plugins/android/arm64-v8a/libcurl.so
diff --git a/Assets/curl-unity/Plugins/android/armeabi-v7a/libcurl.so b/Assets/curl-unity/Plugins/android/armeabi-v7a/libcurl.so
diff --git a/Assets/curl-unity/Plugins/android/x86/libcurl.so b/Assets/curl-unity/Plugins/android/x86/libcurl.so
diff --git a/Assets/curl-unity/Plugins/ios/libcurl.a b/Assets/curl-unity/Plugins/ios/libcurl.a
diff --git a/Assets/curl-unity/Plugins/osx/curl.bundle/Contents/MacOS/curl b/Assets/curl-unity/Plugins/osx/curl.bundle/Contents/MacOS/curl
diff --git a/build/curl/make_ios.sh b/build/curl/make_ios.sh
@@ -15,6 +15,7 @@ do_make()
         cd $BUILD_DIR
         cmake $CURL_ROOT \
             -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN \
+            -DIOS_PLATFORM=OS64 \
             -DDEPLOYMENT_TARGET=12.0 \
             -DENABLE_BITCODE=1 \
             -DOPENSSL_ROOT_DIR=$OPENSSL_ROOT \
@@ -33,4 +34,4 @@ do_make()
     cmake --build $BUILD_DIR --config Release --target install -j8
 }
 
-do_make
+do_make
diff --git a/build/curl/prebuilt/android/arm64-v8a/lib/libcurl.so b/build/curl/prebuilt/android/arm64-v8a/lib/libcurl.so
diff --git a/build/curl/prebuilt/android/armeabi-v7a/lib/libcurl.so b/build/curl/prebuilt/android/armeabi-v7a/lib/libcurl.so
diff --git a/build/curl/prebuilt/android/x86/lib/libcurl.so b/build/curl/prebuilt/android/x86/lib/libcurl.so
diff --git a/build/curl/prebuilt/osx/bin/curl b/build/curl/prebuilt/osx/bin/curl
diff --git a/build/curl/prebuilt/osx/lib/libcurl.dylib b/build/curl/prebuilt/osx/lib/libcurl.dylib
diff --git a/build/nghttp2/make_ios.sh b/build/nghttp2/make_ios.sh
@@ -11,9 +11,10 @@ mkdir -p $BUILD_DIR
         -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN \
         -DCMAKE_INSTALL_PREFIX=$PREBUILT_DIR \
         -DIOS_PLATFORM=OS64 \
-        -DENABLE_BITCODE=0 \
+        -DDEPLOYMENT_TARGET=12.0 \
+        -DENABLE_BITCODE=1 \        
         -DENABLE_LIB_ONLY=ON \
         -DENABLE_STATIC_LIB=ON \
         -DENABLE_SHARED_LIB=OFF
 )
-cmake --build $BUILD_DIR --config Release --target install
+cmake --build $BUILD_DIR --config Release --target install
diff --git a/build/nghttp2/prebuilt/android/arm64-v8a/lib/libnghttp2.a b/build/nghttp2/prebuilt/android/arm64-v8a/lib/libnghttp2.a
diff --git a/build/nghttp2/prebuilt/android/armeabi-v7a/lib/libnghttp2.a b/build/nghttp2/prebuilt/android/armeabi-v7a/lib/libnghttp2.a
diff --git a/build/nghttp2/prebuilt/android/x86/lib/libnghttp2.a b/build/nghttp2/prebuilt/android/x86/lib/libnghttp2.a
diff --git a/build/nghttp2/prebuilt/osx/lib/libnghttp2.a b/build/nghttp2/prebuilt/osx/lib/libnghttp2.a
diff --git a/build/openssl/make_ios.sh b/build/openssl/make_ios.sh
@@ -8,7 +8,7 @@ do_make()
 {
     PREBUILT_DIR=`pwd`/prebuilt/ios
     export XCODE=`xcode-select --print-path`
-    export CC='${XCODE}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang'
+    export CC='${XCODE}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -fembed-bitcode'
     export CROSS_TOP=${XCODE}/Platforms/iPhoneOS.platform/Developer
     export CROSS_SDK=iPhoneOS.sdk
 
@@ -22,4 +22,4 @@ do_make()
     mkdir -p $PREBUILT_DIR
 }
 
-do_make
+do_make
diff --git a/build/openssl/prebuilt/android/arm64-v8a/lib/libcrypto.a b/build/openssl/prebuilt/android/arm64-v8a/lib/libcrypto.a
diff --git a/build/openssl/prebuilt/android/arm64-v8a/lib/libssl.a b/build/openssl/prebuilt/android/arm64-v8a/lib/libssl.a
diff --git a/build/openssl/prebuilt/android/armeabi-v7a/lib/libcrypto.a b/build/openssl/prebuilt/android/armeabi-v7a/lib/libcrypto.a
diff --git a/build/openssl/prebuilt/android/armeabi-v7a/lib/libssl.a b/build/openssl/prebuilt/android/armeabi-v7a/lib/libssl.a
diff --git a/build/openssl/prebuilt/android/x86/lib/libcrypto.a b/build/openssl/prebuilt/android/x86/lib/libcrypto.a
diff --git a/build/openssl/prebuilt/android/x86/lib/libssl.a b/build/openssl/prebuilt/android/x86/lib/libssl.a
diff --git a/build/openssl/prebuilt/ios/lib/libcrypto.a b/build/openssl/prebuilt/ios/lib/libcrypto.a
diff --git a/build/openssl/prebuilt/ios/lib/libssl.a b/build/openssl/prebuilt/ios/lib/libssl.a
diff --git a/build/openssl/prebuilt/osx/lib/libcrypto.a b/build/openssl/prebuilt/osx/lib/libcrypto.a
diff --git a/build/openssl/prebuilt/osx/lib/libssl.a b/build/openssl/prebuilt/osx/lib/libssl.a