Merge pull request #818 from meganz/update_scritps_ios_3rdparty

Updated build scripts for libevent and libws
meganz · Sep 19, 2017 · 6248db9 · 6248db9
2 parents 13f844d + cb2532c
commit 6248db9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/bindings/ios/3rdparty/build-libevent2.sh b/bindings/ios/3rdparty/build-libevent2.sh
@@ -34,9 +34,9 @@ esac
 
 set -e
 
-if [ ! -d "karere-native" ]
+if [ ! -d "libevent" ]
 then
-git clone --recursive -b develop https://code.developers.mega.co.nz/messenger/karere-native
+git clone --recursive -b master https://github.com/meganz/libevent
 fi
 
 for ARCH in ${ARCHS}
@@ -48,7 +48,7 @@ else
 PLATFORM="iPhoneOS"
 fi
 
-pushd karere-native/third-party/libevent
+pushd libevent
 git reset --hard && git clean -dfx
 
 export BUILD_TOOLS="${DEVELOPER}"
@@ -98,7 +98,7 @@ lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-i386.sdk/libevent_p
 lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-i386.sdk/libevent_openssl.a ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-x86_64.sdk/libevent_openssl.a  ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7.sdk/libevent_openssl.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7s.sdk/libevent_openssl.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-arm64.sdk/libevent_openssl.a -output ${CURRENTPATH}/lib/libevent_openssl.a
 
 mkdir -p include/libevent || true
-cp -f -R karere-native/third-party/libevent/include/* include/libevent/
+cp -f -R libevent/include/* include/libevent/
 
 #rm -rf bin
 #rm -rf expat-${EXPAT_VERSION}

diff --git a/bindings/ios/3rdparty/build-libws.sh b/bindings/ios/3rdparty/build-libws.sh
@@ -34,9 +34,9 @@ esac
 
 set -e
 
-if [ ! -d "karere-native" ]
+if [ ! -d "libws" ]
 then
-git clone --recursive -b develop https://code.developers.mega.co.nz/messenger/karere-native
+git clone --recursive -b master https://github.com/meganz/libws
 fi
 
 for ARCH in ${ARCHS}
@@ -59,7 +59,7 @@ IOSC_CMAKE_TOOLCHAIN="../ios.toolchain.cmake"
 IOSC_SYSROOT=`xcrun -sdk $IOSC_TARGET -show-sdk-path`
 # the same as SDKROOT
 
-pushd karere-native/third-party/libws
+pushd libws
 git reset --hard && git clean -dfx
 
 export BUILD_TOOLS="${DEVELOPER}"
@@ -116,7 +116,7 @@ mkdir lib || true
 lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-i386.sdk/libws.a ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-x86_64.sdk/libws.a  ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7.sdk/libws.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7s.sdk/libws.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-arm64.sdk/libws.a -output ${CURRENTPATH}/lib/libws.a
 
 mkdir -p include/libws || true
-cp -f -R karere-native/third-party/libws/src/*.h include/libws/
-cp -f -R karere-native/third-party/libws/libws_config.h include/libws/
+cp -f -R libws/src/*.h include/libws/
+cp -f -R libws/libws_config.h include/libws/
 
 echo "Done."