compile websockets without ssl support

Author: zilongshanren

build/ios/build.sh

@@ -121,7 +121,7 @@ fi
 
 BUILDDIR="${COCOSROOT}/build-ios-${PLATFORM}/${ARCH}"
 
-PREFIX="${COCOSROOT}/install-ios-${PLATFORM}/${ARCH}"
+PREFIX="${COCOSROOT}/contrib/install-ios-${PLATFORM}/${ARCH}"
 
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"
 
@@ -196,10 +196,12 @@ else
     export ASCPP="xcrun as"
 fi
 
+
+
 ../bootstrap ${OPTIONS} \
         --build=x86_64-apple-darwin14 \
         --host=${TARGET} \
-        --prefix=${COCOSROOT}/contrib/${TARGET}-${ARCH} > ${out}
+        --prefix=${PREFIX} > ${out}
 
 echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS += ${EXTRA_LDFLAGS}" >> config.mak

contrib/src/openssl/rules.mak

@@ -30,6 +30,9 @@ ifeq ($(IOS_ARCH),i386)
 OPENSSL_CONFIG_VARS="BSD-generic32"
 endif
 
+ifeq ($(IOS_ARCH),arm64)
+OPENSSL_CONFIG_VARS="BSD-generic64"
+endif
 
 $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
 	$(call download,$(OPENSSL_URL))

contrib/src/websockets/rules.mak

@@ -18,9 +18,7 @@ endif
 
 DEPS_websockets = zlib $(DEPS_zlib)
 
-DEPS_websockets = openssl $(DEPS_openssl)
-
-.websockets: websockets .zlib .openssl toolchain.cmake
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release
+.websockets: websockets .zlib toolchain.cmake
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release -DLWS_WITH_SSL=0
 	cd $< && $(MAKE) install
 	touch $@