Updated iOS scripts for SDK 8.0

Author: ras0219-msft

Build_iOS/configure.sh

@@ -1,16 +1,10 @@
 #!/bin/bash
 set -e
 
-git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git
-pushd OpenSSL-for-iPhone
-./build-libssl.sh
-popd
-mkdir openssl
-mv OpenSSL-for-iPhone/include openssl
-mv OpenSSL-for-iPhone/lib openssl
 git clone https://git.gitorious.org/boostoniphone/galbraithjosephs-boostoniphone.git boostoniphone
 pushd boostoniphone
-sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system"}/g' -i .bak boost.sh
+sed -e 's/\${IPHONE_SDKVERSION:=7.0}/\${IPHONE_SDKVERSION:=8.0}/' -i .bak boost.sh
+sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system date_time"}/g' -i .bak boost.sh
 ./boost.sh
 pushd ios/framework/boost.framework/Versions/A
 mkdir Headers2
@@ -19,6 +13,15 @@ mv Headers2 Headers
 popd
 popd
 mv boostoniphone/ios/framework/boost.framework .
+
+git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git
+pushd OpenSSL-for-iPhone
+./build-libssl.sh
+popd
+mkdir openssl
+mv OpenSSL-for-iPhone/include openssl
+mv OpenSSL-for-iPhone/lib openssl
+
 hg clone https://code.google.com/p/ios-cmake/
 mkdir build.ios
 pushd build.ios

Release/src/websockets/client/ws_client.cpp

@@ -41,9 +41,21 @@
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#if defined(__APPLE__)
+#include "stdlib.h"
+// Issue caused by iOS SDK 8.0
+#pragma push_macro("ntohll")
+#pragma push_macro("htonll")
+#undef ntohll
+#undef htonll
+#endif
 #include <websocketpp/config/asio_client.hpp>
 #include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/client.hpp>
+#if defined(__APPLE__)
+#pragma pop_macro("htonll")
+#pragma pop_macro("ntohll")
+#endif
 #pragma GCC diagnostic pop
 #else /* __GNUC__ */
 #pragma warning( disable : 4503 )