diff options
Diffstat (limited to 'deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi')
-rw-r--r-- | deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi index 17e4904823..d42e7a5ecf 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi @@ -1,11 +1,15 @@ { 'variables': { 'openssl_defines_VC-WIN32': [ - 'DSO_WIN32', 'NDEBUG', - 'OPENSSL_THREADS', - 'OPENSSL_NO_DYNAMIC_ENGINE', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', 'OPENSSL_PIC', + 'OPENSSL_CPUID_OBJ', 'OPENSSL_BN_ASM_PART_WORDS', 'OPENSSL_IA32_SSE2', 'OPENSSL_BN_ASM_MONT', @@ -25,14 +29,15 @@ 'POLY1305_ASM', ], 'openssl_cflags_VC-WIN32': [ - '-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DUNICODE -D_UNICODE /O2', + '-Wa,--noexecstack', + '/W3 /wd4090 /nologo /O2 /WX', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2 /WX', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], 'openssl_cli_srcs_VC-WIN32': [ - 'openssl/apps/app_rand.c', - 'openssl/apps/apps.c', 'openssl/apps/asn1pars.c', 'openssl/apps/ca.c', 'openssl/apps/ciphers.c', @@ -54,7 +59,6 @@ 'openssl/apps/nseq.c', 'openssl/apps/ocsp.c', 'openssl/apps/openssl.c', - 'openssl/apps/opt.c', 'openssl/apps/passwd.c', 'openssl/apps/pkcs12.c', 'openssl/apps/pkcs7.c', @@ -68,21 +72,26 @@ 'openssl/apps/req.c', 'openssl/apps/rsa.c', 'openssl/apps/rsautl.c', - 'openssl/apps/s_cb.c', 'openssl/apps/s_client.c', 'openssl/apps/s_server.c', - 'openssl/apps/s_socket.c', 'openssl/apps/s_time.c', 'openssl/apps/sess_id.c', 'openssl/apps/smime.c', 'openssl/apps/speed.c', 'openssl/apps/spkac.c', 'openssl/apps/srp.c', + 'openssl/apps/storeutl.c', 'openssl/apps/ts.c', 'openssl/apps/verify.c', 'openssl/apps/version.c', - 'openssl/apps/win32_init.c', 'openssl/apps/x509.c', + 'openssl/apps/app_rand.c', + 'openssl/apps/apps.c', + 'openssl/apps/bf_prefix.c', + 'openssl/apps/opt.c', + 'openssl/apps/s_cb.c', + 'openssl/apps/s_socket.c', + 'openssl/apps/win32_init.c', ], }, 'defines': ['<@(openssl_defines_VC-WIN32)'], |