revert the modification of websockets

cocos2d · Jan 4, 2017 · 13f05c7 · 13f05c7
1 parent d9d809c
commit 13f05c7
Show file tree

Hide file tree

Showing 48 changed files with 10,566 additions and 3,307 deletions.
diff --git a/curl/prebuilt/android/Android.mk b/curl/prebuilt/android/Android.mk
@@ -8,15 +8,3 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
 LOCAL_STATIC_LIBRARIES += cocos_ssl_static
 LOCAL_STATIC_LIBRARIES += cocos_crypto_static
 include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocos_crypto_static
-LOCAL_MODULE_FILENAME := crypto
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_MODULE := cocos_ssl_static
-LOCAL_MODULE_FILENAME := ssl
-LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
-include $(PREBUILT_STATIC_LIBRARY)
diff --git a/openssl/prebuilt/android/Android.mk b/openssl/prebuilt/android/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cocos_crypto_static
+LOCAL_MODULE_FILENAME := crypto
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+LOCAL_MODULE := cocos_ssl_static
+LOCAL_MODULE_FILENAME := ssl
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
+include $(PREBUILT_STATIC_LIBRARY)
diff --git a/curl/prebuilt/android/arm64-v8a/libcrypto.a → ...sl/prebuilt/android/arm64-v8a/libcrypto.a b/curl/prebuilt/android/arm64-v8a/libcrypto.a → ...sl/prebuilt/android/arm64-v8a/libcrypto.a
diff --git a/curl/prebuilt/android/arm64-v8a/libssl.a → openssl/prebuilt/android/arm64-v8a/libssl.a b/curl/prebuilt/android/arm64-v8a/libssl.a → openssl/prebuilt/android/arm64-v8a/libssl.a
diff --git a/.../prebuilt/android/armeabi-v7a/libcrypto.a → .../prebuilt/android/armeabi-v7a/libcrypto.a b/.../prebuilt/android/armeabi-v7a/libcrypto.a → .../prebuilt/android/armeabi-v7a/libcrypto.a
diff --git a/curl/prebuilt/android/armeabi-v7a/libssl.a → ...ssl/prebuilt/android/armeabi-v7a/libssl.a b/curl/prebuilt/android/armeabi-v7a/libssl.a → ...ssl/prebuilt/android/armeabi-v7a/libssl.a
diff --git a/curl/prebuilt/android/armeabi/libcrypto.a → openssl/prebuilt/android/armeabi/libcrypto.a b/curl/prebuilt/android/armeabi/libcrypto.a → openssl/prebuilt/android/armeabi/libcrypto.a
diff --git a/curl/prebuilt/android/armeabi/libssl.a → openssl/prebuilt/android/armeabi/libssl.a b/curl/prebuilt/android/armeabi/libssl.a → openssl/prebuilt/android/armeabi/libssl.a
diff --git a/curl/prebuilt/android/x86/libcrypto.a → openssl/prebuilt/android/x86/libcrypto.a b/curl/prebuilt/android/x86/libcrypto.a → openssl/prebuilt/android/x86/libcrypto.a
diff --git a/curl/prebuilt/android/x86/libssl.a → openssl/prebuilt/android/x86/libssl.a b/curl/prebuilt/android/x86/libssl.a → openssl/prebuilt/android/x86/libssl.a
diff --git a/curl/prebuilt/ios/libcrypto.a → openssl/prebuilt/ios/libcrypto.a b/curl/prebuilt/ios/libcrypto.a → openssl/prebuilt/ios/libcrypto.a
diff --git a/curl/prebuilt/ios/libssl.a → openssl/prebuilt/ios/libssl.a b/curl/prebuilt/ios/libssl.a → openssl/prebuilt/ios/libssl.a
diff --git a/curl/prebuilt/mac/libcrypto.a → openssl/prebuilt/mac/libcrypto.a b/curl/prebuilt/mac/libcrypto.a → openssl/prebuilt/mac/libcrypto.a
diff --git a/curl/prebuilt/mac/libssl.a → openssl/prebuilt/mac/libssl.a b/curl/prebuilt/mac/libssl.a → openssl/prebuilt/mac/libssl.a
diff --git a/curl/prebuilt/win10/arm/libeay32.dll → openssl/prebuilt/win10/arm/libeay32.dll b/curl/prebuilt/win10/arm/libeay32.dll → openssl/prebuilt/win10/arm/libeay32.dll
diff --git a/curl/prebuilt/win10/arm/ssleay32.dll → openssl/prebuilt/win10/arm/ssleay32.dll b/curl/prebuilt/win10/arm/ssleay32.dll → openssl/prebuilt/win10/arm/ssleay32.dll
diff --git a/curl/prebuilt/win10/win32/libeay32.dll → openssl/prebuilt/win10/win32/libeay32.dll b/curl/prebuilt/win10/win32/libeay32.dll → openssl/prebuilt/win10/win32/libeay32.dll
diff --git a/curl/prebuilt/win10/win32/ssleay32.dll → openssl/prebuilt/win10/win32/ssleay32.dll b/curl/prebuilt/win10/win32/ssleay32.dll → openssl/prebuilt/win10/win32/ssleay32.dll
diff --git a/curl/prebuilt/win10/x64/libeay32.dll → openssl/prebuilt/win10/x64/libeay32.dll b/curl/prebuilt/win10/x64/libeay32.dll → openssl/prebuilt/win10/x64/libeay32.dll
diff --git a/curl/prebuilt/win10/x64/ssleay32.dll → openssl/prebuilt/win10/x64/ssleay32.dll b/curl/prebuilt/win10/x64/ssleay32.dll → openssl/prebuilt/win10/x64/ssleay32.dll
diff --git a/curl/prebuilt/win32/libeay32.lib → openssl/prebuilt/win32/libeay32.lib b/curl/prebuilt/win32/libeay32.lib → openssl/prebuilt/win32/libeay32.lib
diff --git a/curl/prebuilt/win32/ssleay32.lib → openssl/prebuilt/win32/ssleay32.lib b/curl/prebuilt/win32/ssleay32.lib → openssl/prebuilt/win32/ssleay32.lib
diff --git a/curl/prebuilt/winrt_8.1/arm/libeay32.dll → openssl/prebuilt/winrt_8.1/arm/libeay32.dll b/curl/prebuilt/winrt_8.1/arm/libeay32.dll → openssl/prebuilt/winrt_8.1/arm/libeay32.dll
diff --git a/curl/prebuilt/winrt_8.1/arm/ssleay32.dll → openssl/prebuilt/winrt_8.1/arm/ssleay32.dll b/curl/prebuilt/winrt_8.1/arm/ssleay32.dll → openssl/prebuilt/winrt_8.1/arm/ssleay32.dll
diff --git a/curl/prebuilt/winrt_8.1/win32/libeay32.dll → ...ssl/prebuilt/winrt_8.1/win32/libeay32.dll b/curl/prebuilt/winrt_8.1/win32/libeay32.dll → ...ssl/prebuilt/winrt_8.1/win32/libeay32.dll
diff --git a/curl/prebuilt/winrt_8.1/win32/ssleay32.dll → ...ssl/prebuilt/winrt_8.1/win32/ssleay32.dll b/curl/prebuilt/winrt_8.1/win32/ssleay32.dll → ...ssl/prebuilt/winrt_8.1/win32/ssleay32.dll
diff --git a/curl/prebuilt/wp_8.1/arm/libeay32.dll → openssl/prebuilt/wp_8.1/arm/libeay32.dll b/curl/prebuilt/wp_8.1/arm/libeay32.dll → openssl/prebuilt/wp_8.1/arm/libeay32.dll
diff --git a/curl/prebuilt/wp_8.1/arm/libeay32.lib → openssl/prebuilt/wp_8.1/arm/libeay32.lib b/curl/prebuilt/wp_8.1/arm/libeay32.lib → openssl/prebuilt/wp_8.1/arm/libeay32.lib
diff --git a/curl/prebuilt/wp_8.1/arm/ssleay32.dll → openssl/prebuilt/wp_8.1/arm/ssleay32.dll b/curl/prebuilt/wp_8.1/arm/ssleay32.dll → openssl/prebuilt/wp_8.1/arm/ssleay32.dll
diff --git a/curl/prebuilt/wp_8.1/arm/ssleay32.lib → openssl/prebuilt/wp_8.1/arm/ssleay32.lib b/curl/prebuilt/wp_8.1/arm/ssleay32.lib → openssl/prebuilt/wp_8.1/arm/ssleay32.lib
diff --git a/curl/prebuilt/wp_8.1/win32/libeay32.dll → openssl/prebuilt/wp_8.1/win32/libeay32.dll b/curl/prebuilt/wp_8.1/win32/libeay32.dll → openssl/prebuilt/wp_8.1/win32/libeay32.dll
diff --git a/curl/prebuilt/wp_8.1/win32/libeay32.lib → openssl/prebuilt/wp_8.1/win32/libeay32.lib b/curl/prebuilt/wp_8.1/win32/libeay32.lib → openssl/prebuilt/wp_8.1/win32/libeay32.lib
diff --git a/curl/prebuilt/wp_8.1/win32/ssleay32.dll → openssl/prebuilt/wp_8.1/win32/ssleay32.dll b/curl/prebuilt/wp_8.1/win32/ssleay32.dll → openssl/prebuilt/wp_8.1/win32/ssleay32.dll
diff --git a/curl/prebuilt/wp_8.1/win32/ssleay32.lib → openssl/prebuilt/wp_8.1/win32/ssleay32.lib b/curl/prebuilt/wp_8.1/win32/ssleay32.lib → openssl/prebuilt/wp_8.1/win32/ssleay32.lib
diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-    "prebuilt_libs_version":"v3-deps-116",
+    "prebuilt_libs_version":"v3-deps-117",
     "freetype":"2.5.5",
     "curl":"7.50.0",
     "jpeg":"9.0",