afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26 from dumganhar/fix/disable-async-for-ios 

Disable async in openssl for ios since apple forbit developers to use the API (setcontext, getcontext, makecontext).
This commit is contained in:
pandamicro 2017-05-24 11:32:41 +08:00 committed by GitHub
parent 29794b4bb9 14994c2752
commit 7fa906b85c
6 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ios/include/openssl/opensslconf-arm32.h
View File

@ -37,8 +37,8 @@ extern "C" {
#ifndef OPENSSL_NO_ASAN #ifndef OPENSSL_NO_ASAN
# define OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN
#endif #endif
#ifndef OPENSSL_NO_ASM #ifndef OPENSSL_NO_ASYNC
# define OPENSSL_NO_ASM # define OPENSSL_NO_ASYNC
#endif #endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG #ifndef OPENSSL_NO_CRYPTO_MDEBUG
# define OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG
@ -147,7 +147,7 @@ extern "C" {
# define DEPRECATEDIN_0_9_8(f) # define DEPRECATEDIN_0_9_8(f)
#endif #endif
#define OPENSSL_CPUID_OBJ
/* Generate 80386 code? */ /* Generate 80386 code? */
#undef I386_ONLY #undef I386_ONLY

3
ios/include/openssl/opensslconf-arm64.h
View File

@ -37,6 +37,9 @@ extern "C" {
#ifndef OPENSSL_NO_ASAN #ifndef OPENSSL_NO_ASAN
# define OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN
#endif #endif
#ifndef OPENSSL_NO_ASYNC
# define OPENSSL_NO_ASYNC
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG #ifndef OPENSSL_NO_CRYPTO_MDEBUG
# define OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG
#endif #endif

3
ios/include/openssl/opensslconf-i386.h
View File

@ -37,6 +37,9 @@ extern "C" {
#ifndef OPENSSL_NO_ASAN #ifndef OPENSSL_NO_ASAN
# define OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN
#endif #endif
#ifndef OPENSSL_NO_ASYNC
# define OPENSSL_NO_ASYNC
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG #ifndef OPENSSL_NO_CRYPTO_MDEBUG
# define OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG
#endif #endif

3
ios/include/openssl/opensslconf-x86_64.h
View File

@ -37,6 +37,9 @@ extern "C" {
#ifndef OPENSSL_NO_ASAN #ifndef OPENSSL_NO_ASAN
# define OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN
#endif #endif
#ifndef OPENSSL_NO_ASYNC
# define OPENSSL_NO_ASYNC
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG #ifndef OPENSSL_NO_CRYPTO_MDEBUG
# define OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG
#endif #endif

BIN
ios/libs/libcrypto.a
View File

Binary file not shown.

BIN
ios/libs/libssl.a
View File

Binary file not shown.